-build issues'

13 files changed, 35 insertions, 56 deletions

diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h
index 4e4e490f0..2cb4ede7e 100644
--- a/src/testbed/testbed.h
+++ b/src/testbed/testbed.h
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file testing/new_testing.h
+ * @file testing/testbed.h
  * @brief IPC messages between testing API and service ("controller")
  * @author Christian Grothoff
  */
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index bffe8162f..fd6db8d14 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -19,14 +19,14 @@
  */
 
 /**
- * @file testing/new_testing_api.c
+ * @file testing/testbed_api.c
  * @brief API for accessing the GNUnet testing service.
  *        This library is supposed to make it easier to write
  *        testcases and script large-scale benchmarks.
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 #include "gnunet_core_service.h"
 #include "gnunet_constants.h"
 #include "gnunet_transport_service.h"
@@ -147,4 +147,4 @@ GNUNET_TESTBED_overlay_write_topology_to_file (struct GNUNET_TESTBED_Controller
 
 
 
-/* end of new_testing_api.c */
+/* end of testbed_api.c */
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index f9ddfdc07..4c23289d6 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -19,14 +19,14 @@
  */
 
 /**
- * @file testing/new_testing_api_hosts.c
+ * @file testing/testbed_api_hosts.c
  * @brief API for manipulating 'hosts' controlled by the GNUnet testing service;
  *        allows parsing hosts files, starting, stopping and communicating (via
  *        SSH/stdin/stdout) with the remote (or local) processes
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 #include "gnunet_core_service.h"
 #include "gnunet_constants.h"
 #include "gnunet_transport_service.h"
@@ -197,4 +197,4 @@ GNUNET_TESTBED_host_run_ (struct GNUNET_TESTBED_Host *host,
 }
 
 
-/* end of new_testing_api_hosts.c */
+/* end of testbed_api_hosts.c */
diff --git a/src/testbed/testbed_api_hosts.h b/src/testbed/testbed_api_hosts.h
index 269b3f2af..73fb14790 100644
--- a/src/testbed/testbed_api_hosts.h
+++ b/src/testbed/testbed_api_hosts.h
@@ -19,14 +19,14 @@
  */
 
 /**
- * @file testing/new_testing_api_hosts.h
+ * @file testing/testbed_api_hosts.h
  * @brief internal API to access the 'hosts' subsystem
  * @author Christian Grothoff
  */
 #ifndef NEW_TESTING_API_HOSTS_H
 #define NEW_TESTING_API_HOSTS_H
 
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 #include "gnunet_helper_lib.h"
 
 
@@ -102,4 +102,4 @@ GNUNET_TESTBED_host_run_ (struct GNUNET_TESTBED_Host *host,
                           GNUNET_SERVER_MessageTokenizerCallback cb, void *cb_cls);
 
 #endif
-/* end of new_testing_api_hosts.h */
+/* end of testbed_api_hosts.h */
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c
index fa75cf435..33c71d917 100644
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -19,12 +19,12 @@
  */
 
 /**
- * @file testing/new_testing_api_operations.c
+ * @file testing/testbed_api_operations.c
  * @brief functions to manage operation queues
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "new_testing_api_operations.h"
+#include "testbed_api_operations.h"
 
 
 /**
@@ -71,4 +71,4 @@ GNUNET_TESTBED_operation_done (struct GNUNET_TESTBED_Operation *operation)
 
 
 
-/* end of new_testing_api_operations.c */
+/* end of testbed_api_operations.c */
diff --git a/src/testbed/testbed_api_operations.h b/src/testbed/testbed_api_operations.h
index 3636fa421..89d4b09a1 100644
--- a/src/testbed/testbed_api_operations.h
+++ b/src/testbed/testbed_api_operations.h
@@ -19,16 +19,16 @@
  */
 
 /**
- * @file testing/new_testing_api_operations.h
+ * @file testing/testbed_api_operations.h
  * @brief internal API to access the 'operations' subsystem
  * @author Christian Grothoff
  */
 #ifndef NEW_TESTING_API_OPERATIONS_H
 #define NEW_TESTING_API_OPERATIONS_H
 
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 #include "gnunet_helper_lib.h"
 
 
 #endif
-/* end of new_testing_api_operations.h */
+/* end of testbed_api_operations.h */
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index c73a0958a..3531c838a 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -19,13 +19,13 @@
  */
 
 /**
- * @file testing/new_testing_api_peers.c
+ * @file testing/testbed_api_peers.c
  * @brief management of the knowledge about peers in this library
  *        (we know the peer ID, its host, pending operations, etc.)
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "new_testing_api_peers.h"
+#include "testbed_api_peers.h"
 
 
 /**
@@ -294,4 +294,4 @@ GNUNET_TESTBED_overlay_connect (void *op_cls,
 
 
 
-/* end of new_testing_api_peers.c */
+/* end of testbed_api_peers.c */
diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h
index 6b2ed7c8b..5c6b53164 100644
--- a/src/testbed/testbed_api_peers.h
+++ b/src/testbed/testbed_api_peers.h
@@ -19,14 +19,14 @@
  */
 
 /**
- * @file testing/new_testing_api_peers.h
+ * @file testing/testbed_api_peers.h
  * @brief internal API to access the 'peers' subsystem
  * @author Christian Grothoff
  */
 #ifndef NEW_TESTING_API_PEERS_H
 #define NEW_TESTING_API_PEERS_H
 
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 #include "gnunet_helper_lib.h"
 
 
@@ -68,4 +68,4 @@ GNUNET_TESTBED_peer_create_with_id_ (uint32_t unique_id,
 
 
 #endif
-/* end of new_testing_api_peers.h */
+/* end of testbed_api_peers.h */
diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c
index 524ec35e3..89427bfd9 100644
--- a/src/testbed/testbed_api_services.c
+++ b/src/testbed/testbed_api_services.c
@@ -19,12 +19,12 @@
  */
 
 /**
- * @file testing/new_testing_api_services.c
+ * @file testing/testbed_api_services.c
  * @brief convenience functions for accessing services
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "new_testing_api_peers.h"
+#include "testbed_api_peers.h"
 
 
 /**
@@ -58,4 +58,4 @@ GNUNET_TESTBED_service_connect (void *op_cls,
   return NULL;
 }
 
-/* end of new_testing_api_services.c */
+/* end of testbed_api_services.c */
diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c
index ed5e2e8e3..5716fc1c3 100644
--- a/src/testbed/testbed_api_test.c
+++ b/src/testbed/testbed_api_test.c
@@ -19,12 +19,12 @@
  */
 
 /**
- * @file testing/new_testing_api_test.c
+ * @file testing/testbed_api_test.c
  * @brief high-level test function
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 
 
 
@@ -64,4 +64,4 @@ GNUNET_TESTBED_test_run (const char *testname,
 
 
 
-/* end of new_testing_api_test.c */
+/* end of testbed_api_test.c */
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 8c917db81..905b12e15 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -19,12 +19,12 @@
  */
 
 /**
- * @file testing/new_testing_api_testbed.c
+ * @file testing/testbed_api_testbed.c
  * @brief high-level testbed management
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 
 
 /**
@@ -150,4 +150,4 @@ GNUNET_TESTBED_run (const char *host_filename,
 
 
 
-/* end of new_testing_api_testbed.c */
+/* end of testbed_api_testbed.c */
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index 12def3a1f..b25bfbc90 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -19,12 +19,12 @@
  */
 
 /**
- * @file testing/new_testing_api_topology.c
+ * @file testing/testbed_api_topology.c
  * @brief topology-generation functions
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_testing_service.h"
+#include "gnunet_testbed_service.h"
 
 
 /**
@@ -124,4 +124,4 @@ GNUNET_TESTBED_overlay_configure_topology (void *op_cls,
   return NULL;
 }
 
-/* end of new_testing_api_topology.c */
+/* end of testbed_api_topology.c */
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 9dfe66b92..4f6f90c4d 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -34,28 +34,7 @@ if HAVE_EXPENSIVE_TESTS
 endif
 
 lib_LTLIBRARIES = \
-  libgnunettesting.la \
-  libgnunettesting_new.la
-
-libgnunettesting_new_la_SOURCES = \
-  new_testing_api.c new_testing.h \
-  new_testing_api_hosts.c new_testing_api_hosts.h \
-  new_testing_api_operations.c new_testing_api_operations.h \
-  new_testing_api_peers.c new_testing_api_peers.h \
-  new_testing_api_services.c \
-  new_testing_api_testbed.c \
-  new_testing_api_test.c \
-  new_testing_api_topology.c
-libgnunettesting_new_la_LIBADD = $(XLIB) \
- $(top_builddir)/src/core/libgnunetcore.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- -lm \
- $(top_builddir)/src/util/libgnunetutil.la 
-libgnunettesting_new_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
+  libgnunettesting.la 
 
 libgnunettesting_la_SOURCES = \
   helper.c \