From bf3e9a7048263eed892f40ba6dd6d1c85897f23d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 10 Jul 2012 14:15:43 +0000 Subject: [PATCH] -misc edits working on #2494, but there are still API issues to be discussed, tests do not work yet --- src/testbed/Makefile.am | 3 ++- src/testbed/test_testbed_api.c | 10 +++++++--- src/testbed/test_testbed_api.conf | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index 012f35e20..7ed7b4720 100644 --- 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 403c1a409..5fab40573 100644 --- 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 bbb521475..bf6c414b8 100644 --- 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 -- 2.25.1