[GNUnet-SVN] r21252 - gnunet/src/testing

[gnunet]

Author: grothoff
Date: 2012-05-03 18:52:54 +0200 (Thu, 03 May 2012)
New Revision: 21252

Modified:
   gnunet/src/testing/Makefile.am
   gnunet/src/testing/new_testing_api_peers.c
   gnunet/src/testing/new_testing_api_peers.h
   gnunet/src/testing/new_testing_api_testbed.c
Log:
-fix compilation of new testing draft

Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am      2012-05-03 15:20:08 UTC (rev 21251)
+++ gnunet/src/testing/Makefile.am      2012-05-03 16:52:54 UTC (rev 21252)
@@ -33,8 +33,30 @@
    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 \
   testing.c  \

Modified: gnunet/src/testing/new_testing_api_peers.c
===================================================================
--- gnunet/src/testing/new_testing_api_peers.c  2012-05-03 15:20:08 UTC (rev 
21251)
+++ gnunet/src/testing/new_testing_api_peers.c  2012-05-03 16:52:54 UTC (rev 
21252)
@@ -127,8 +127,8 @@
  * @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)
 {

Modified: gnunet/src/testing/new_testing_api_peers.h
===================================================================
--- gnunet/src/testing/new_testing_api_peers.h  2012-05-03 15:20:08 UTC (rev 
21251)
+++ gnunet/src/testing/new_testing_api_peers.h  2012-05-03 16:52:54 UTC (rev 
21252)
@@ -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);
 

Modified: gnunet/src/testing/new_testing_api_testbed.c
===================================================================
--- gnunet/src/testing/new_testing_api_testbed.c        2012-05-03 15:20:08 UTC 
(rev 21251)
+++ gnunet/src/testing/new_testing_api_testbed.c        2012-05-03 16:52:54 UTC 
(rev 21252)
@@ -59,7 +59,7 @@
                                  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 @@
                               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);