-misc edits working on #2494, but there are still API issues to be discussed, tests...

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 012f35e20bd062bf05c9205a74968b49289cd8c0..7ed7b4720bfbfc6c99a18ed6a70f49df469518cc 100644 (file)
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -56,7 +56,8 @@ check_PROGRAMS = \
  test_testbed_api
 
 if ENABLE_TEST_RUN
-  TESTS = $(check_PROGRAMS)
+ TESTS = \
+   test_testbed_api_hosts 
 endif
 
 test_testbed_api_hosts_SOURCES = \

diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index 403c1a4094035452df0e32e97fe99d2d175914ec..5fab405738634d9d2cc2c1363a76ac97116123fc 100644 (file)
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -175,7 +175,7 @@ run (void *cls,
   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 @@ run (void *cls,
  */
 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;
 }

diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf
index bbb52147596f154c93328d4a82bb5f2f16879433..bf6c414b8b67156ed063cafbe667a3cac0c2588c 100644 (file)
--- a/src/testbed/test_testbed_api.conf
+++ b/src/testbed/test_testbed_api.conf
@@ -40,7 +40,7 @@ WAN_QUOTA_IN = 3932160
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core testbed
+DEFAULTSERVICES =
 PORT = 12366
 DEBUG = NO