diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-07-10 14:15:43 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-07-10 14:15:43 +0000 |
commit | bf3e9a7048263eed892f40ba6dd6d1c85897f23d (patch) | |
tree | bbd841a5bc3117c0dade1b4568a86504fe2cc980 /src/testbed/test_testbed_api.c | |
parent | 1020365c9b36987b8f6204bacb0adb665506f97a (diff) | |
download | gnunet-bf3e9a7048263eed892f40ba6dd6d1c85897f23d.tar.gz gnunet-bf3e9a7048263eed892f40ba6dd6d1c85897f23d.zip |
-misc edits working on #2494, but there are still API issues to be discussed, tests do not work yet
Diffstat (limited to 'src/testbed/test_testbed_api.c')
-rw-r--r-- | src/testbed/test_testbed_api.c | 10 |
1 files changed, 7 insertions, 3 deletions
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 | } |