4 files changed, 28 insertions, 6 deletions

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 47a4e1bd0..9dfe66b92 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -33,7 +33,29 @@ if HAVE_EXPENSIVE_TESTS
    test_testing_topology_scale_free
 endif
 
-lib_LTLIBRARIES = libgnunettesting.la
+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_SOURCES = \
   helper.c \
diff --git a/src/testing/new_testing_api_peers.c b/src/testing/new_testing_api_peers.c
index fae38b3be..305b86b17 100644
--- a/src/testing/new_testing_api_peers.c
+++ b/src/testing/new_testing_api_peers.c
@@ -127,8 +127,8 @@ GNUNET_TESTING_peer_lookup_by_id_ (uint32_t id)
  * @return handle to the peer (actual startup will happen asynchronously)
  */
 struct GNUNET_TESTING_Peer *
-GNUNET_TESTING_peer_create_with_id_ (struct GNUNET_TESTING_Controller *controller,
-                                     uint32_t unique_id,                                     
+GNUNET_TESTING_peer_create_with_id_ (uint32_t unique_id,                                     
+                                     struct GNUNET_TESTING_Controller *controller,                                   
                                      struct GNUNET_TESTING_Host *host,
                                      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
diff --git a/src/testing/new_testing_api_peers.h b/src/testing/new_testing_api_peers.h
index a7987f6b2..97c9e4fd9 100644
--- a/src/testing/new_testing_api_peers.h
+++ b/src/testing/new_testing_api_peers.h
@@ -61,7 +61,7 @@
  */
 struct GNUNET_TESTING_Peer *
 GNUNET_TESTING_peer_create_with_id_ (uint32_t unique_id,
-                                     struct GNUNET_TESTING_Controller *controller,
+                                     struct GNUNET_TESTING_Controller *controller,                                   
                                      struct GNUNET_TESTING_Host *host,
                                      const struct GNUNET_CONFIGURATION_Handle *cfg);
 
diff --git a/src/testing/new_testing_api_testbed.c b/src/testing/new_testing_api_testbed.c
index a86b8a237..e027043b9 100644
--- a/src/testing/new_testing_api_testbed.c
+++ b/src/testing/new_testing_api_testbed.c
@@ -59,7 +59,7 @@ GNUNET_TESTING_testbed_create_va (struct GNUNET_TESTING_Controller *controller,
                                   struct GNUNET_TESTING_Host **hosts,
                                   unsigned int num_peers,
                                   const struct GNUNET_CONFIGURATION_Handle *peer_cfg,
-                                  enum GNUNET_TESTING_Topology underlay_topology,
+                                  enum GNUNET_TESTING_TopologyOption underlay_topology,
                                   va_list va)
 {
   GNUNET_break (0);
@@ -89,7 +89,7 @@ GNUNET_TESTING_testbed_create (struct GNUNET_TESTING_Controller *controller,
                                struct GNUNET_TESTING_Host **hosts,
                                unsigned int num_peers,
                                const struct GNUNET_CONFIGURATION_Handle *peer_cfg,
-                               enum GNUNET_TESTING_Topology underlay_topology,
+                               enum GNUNET_TESTING_TopologyOption underlay_topology,
                                ...)
 {
   GNUNET_break (0);