[GNUnet-SVN] r22592 - gnunet/src/testbed

[gnunet]

Author: grothoff
Date: 2012-07-10 16:15:43 +0200 (Tue, 10 Jul 2012)
New Revision: 22592

Modified:
   gnunet/src/testbed/Makefile.am
   gnunet/src/testbed/test_testbed_api.c
   gnunet/src/testbed/test_testbed_api.conf
Log:
-misc edits working on #2494, but there are still API issues to be discussed, 
tests do not work yet

Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am      2012-07-10 14:05:41 UTC (rev 22591)
+++ gnunet/src/testbed/Makefile.am      2012-07-10 14:15:43 UTC (rev 22592)
@@ -56,7 +56,8 @@
  test_testbed_api
 
 if ENABLE_TEST_RUN
-  TESTS = $(check_PROGRAMS)
+ TESTS = \
+   test_testbed_api_hosts 
 endif
 
 test_testbed_api_hosts_SOURCES = \

Modified: gnunet/src/testbed/test_testbed_api.c
===================================================================
--- gnunet/src/testbed/test_testbed_api.c       2012-07-10 14:05:41 UTC (rev 
22591)
+++ gnunet/src/testbed/test_testbed_api.c       2012-07-10 14:15:43 UTC (rev 
22592)
@@ -175,7 +175,7 @@
   cfg = config;
   host = GNUNET_TESTBED_host_create (NULL, NULL, 0);
   GNUNET_assert (NULL != host);
-  event_mask ^= event_mask;    /* NULL out */
+  event_mask = 0;
   event_mask |= (1L << GNUNET_TESTBED_ET_PEER_START);
   event_mask |= (1L << GNUNET_TESTBED_ET_PEER_STOP);
   event_mask |= (1L << GNUNET_TESTBED_ET_CONNECT);
@@ -199,11 +199,15 @@
  */
 int main (int argc, char **argv)
 {
+  struct GNUNET_TESTBED_ControllerProc *cp;
+
+  cp = GNUNET_TESTBED_controller_start (NULL);
+  
   result = GNUNET_SYSERR;
   if (0 != GNUNET_TESTING_peer_run ("test_testbed_api",
-                                    //                                "arm",
                                     "test_testbed_api.conf",
                                     &run, NULL))
     return 1;
-  else return (GNUNET_OK == result) ? 0 : 1;
+  GNUNET_TESTBED_controller_stop (cp);
+  return result;
 }

Modified: gnunet/src/testbed/test_testbed_api.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api.conf    2012-07-10 14:05:41 UTC (rev 
22591)
+++ gnunet/src/testbed/test_testbed_api.conf    2012-07-10 14:15:43 UTC (rev 
22592)
@@ -40,7 +40,7 @@
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core testbed
+DEFAULTSERVICES =
 PORT = 12366
 DEBUG = NO