diff options
Diffstat (limited to 'src/testbed/test_testbed_api_testbed_run.c')
-rw-r--r-- | src/testbed/test_testbed_api_testbed_run.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index d41e33772..9cad74a7b 100644 --- a/src/testbed/test_testbed_api_testbed_run.c +++ b/src/testbed/test_testbed_api_testbed_run.c | |||
@@ -70,7 +70,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
70 | { | 70 | { |
71 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 71 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) |
72 | GNUNET_SCHEDULER_cancel (abort_task); | 72 | GNUNET_SCHEDULER_cancel (abort_task); |
73 | GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */ | 73 | GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */ |
74 | } | 74 | } |
75 | 75 | ||
76 | 76 | ||
@@ -97,7 +97,8 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
97 | * @param peers handle to peers run in the testbed | 97 | * @param peers handle to peers run in the testbed |
98 | */ | 98 | */ |
99 | static void | 99 | static void |
100 | test_master (void *cls, unsigned int num_peers, struct GNUNET_TESTBED_Peer **peers_) | 100 | test_master (void *cls, unsigned int num_peers, |
101 | struct GNUNET_TESTBED_Peer **peers_) | ||
101 | { | 102 | { |
102 | result = GNUNET_OK; | 103 | result = GNUNET_OK; |
103 | GNUNET_assert (NULL != peers[0]); | 104 | GNUNET_assert (NULL != peers[0]); |
@@ -201,8 +202,8 @@ main (int argc, char **argv) | |||
201 | #endif | 202 | #endif |
202 | if (0 != strcmp ("run", testname)) | 203 | if (0 != strcmp ("run", testname)) |
203 | { | 204 | { |
204 | GNUNET_asprintf (&config_filename, | 205 | GNUNET_asprintf (&config_filename, "test_testbed_api_testbed_run_%s.conf", |
205 | "test_testbed_api_testbed_run_%s.conf", testname); | 206 | testname); |
206 | } | 207 | } |
207 | else | 208 | else |
208 | config_filename = GNUNET_strdup ("test_testbed_api.conf"); | 209 | config_filename = GNUNET_strdup ("test_testbed_api.conf"); |