diff options
-rw-r--r-- | src/testbed/Makefile.am | 3 | ||||
-rw-r--r-- | src/testbed/test_testbed_api.c | 10 | ||||
-rw-r--r-- | 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 = \ | |||
56 | test_testbed_api | 56 | test_testbed_api |
57 | 57 | ||
58 | if ENABLE_TEST_RUN | 58 | if ENABLE_TEST_RUN |
59 | TESTS = $(check_PROGRAMS) | 59 | TESTS = \ |
60 | test_testbed_api_hosts | ||
60 | endif | 61 | endif |
61 | 62 | ||
62 | test_testbed_api_hosts_SOURCES = \ | 63 | 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, | |||
175 | cfg = config; | 175 | cfg = config; |
176 | host = GNUNET_TESTBED_host_create (NULL, NULL, 0); | 176 | host = GNUNET_TESTBED_host_create (NULL, NULL, 0); |
177 | GNUNET_assert (NULL != host); | 177 | GNUNET_assert (NULL != host); |
178 | event_mask ^= event_mask; /* NULL out */ | 178 | event_mask = 0; |
179 | event_mask |= (1L << GNUNET_TESTBED_ET_PEER_START); | 179 | event_mask |= (1L << GNUNET_TESTBED_ET_PEER_START); |
180 | event_mask |= (1L << GNUNET_TESTBED_ET_PEER_STOP); | 180 | event_mask |= (1L << GNUNET_TESTBED_ET_PEER_STOP); |
181 | event_mask |= (1L << GNUNET_TESTBED_ET_CONNECT); | 181 | event_mask |= (1L << GNUNET_TESTBED_ET_CONNECT); |
@@ -199,11 +199,15 @@ run (void *cls, | |||
199 | */ | 199 | */ |
200 | int main (int argc, char **argv) | 200 | int main (int argc, char **argv) |
201 | { | 201 | { |
202 | struct GNUNET_TESTBED_ControllerProc *cp; | ||
203 | |||
204 | cp = GNUNET_TESTBED_controller_start (NULL); | ||
205 | |||
202 | result = GNUNET_SYSERR; | 206 | result = GNUNET_SYSERR; |
203 | if (0 != GNUNET_TESTING_peer_run ("test_testbed_api", | 207 | if (0 != GNUNET_TESTING_peer_run ("test_testbed_api", |
204 | // "arm", | ||
205 | "test_testbed_api.conf", | 208 | "test_testbed_api.conf", |
206 | &run, NULL)) | 209 | &run, NULL)) |
207 | return 1; | 210 | return 1; |
208 | else return (GNUNET_OK == result) ? 0 : 1; | 211 | GNUNET_TESTBED_controller_stop (cp); |
212 | return result; | ||
209 | } | 213 | } |
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 | |||
40 | PORT = 12092 | 40 | PORT = 12092 |
41 | 41 | ||
42 | [arm] | 42 | [arm] |
43 | DEFAULTSERVICES = core testbed | 43 | DEFAULTSERVICES = |
44 | PORT = 12366 | 44 | PORT = 12366 |
45 | DEBUG = NO | 45 | DEBUG = NO |
46 | 46 | ||