diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-12-11 12:27:41 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-12-11 12:27:41 +0000 |
commit | 15d78567a6dfa9f4644321e094c8b0eec717ec4e (patch) | |
tree | 4fe9977c8df426847c166ae9dfccfe20196a8dc9 /src | |
parent | c70d10589c4189a255066032bdd1d72204641247 (diff) | |
download | gnunet-15d78567a6dfa9f4644321e094c8b0eec717ec4e.tar.gz gnunet-15d78567a6dfa9f4644321e094c8b0eec717ec4e.zip |
GNUNET_TESTBED_test_run to return status
Diffstat (limited to 'src')
-rw-r--r-- | src/consensus/gnunet-consensus-start-peers.c | 16 | ||||
-rw-r--r-- | src/dht/dht_test_lib.c | 10 | ||||
-rw-r--r-- | src/fs/perf_gnunet_service_fs_p2p.c | 10 | ||||
-rw-r--r-- | src/fs/perf_gnunet_service_fs_p2p_respect.c | 10 | ||||
-rw-r--r-- | src/fs/test_fs_test_lib.c | 10 | ||||
-rw-r--r-- | src/fs/test_gnunet_service_fs_migration.c | 12 | ||||
-rw-r--r-- | src/fs/test_gnunet_service_fs_p2p.c | 10 | ||||
-rw-r--r-- | src/gns/test_gns_dht_three_peers.c | 8 | ||||
-rw-r--r-- | src/include/gnunet_testbed_service.h | 3 | ||||
-rw-r--r-- | src/nse/test_nse_multipeer.c | 10 | ||||
-rw-r--r-- | src/stream/perf_stream_api.c | 5 | ||||
-rw-r--r-- | src/stream/test_stream_2peers.c | 8 | ||||
-rw-r--r-- | src/stream/test_stream_2peers_halfclose.c | 8 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_test.c | 8 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_topology.c | 8 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_topology_clique.c | 8 | ||||
-rw-r--r-- | src/testbed/testbed_api_test.c | 8 | ||||
-rw-r--r-- | src/topology/test_gnunet_daemon_topology.c | 10 |
18 files changed, 88 insertions, 74 deletions
diff --git a/src/consensus/gnunet-consensus-start-peers.c b/src/consensus/gnunet-consensus-start-peers.c index 19eec7744..fb7f047ae 100644 --- a/src/consensus/gnunet-consensus-start-peers.c +++ b/src/consensus/gnunet-consensus-start-peers.c | |||
@@ -139,14 +139,14 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
139 | return; | 139 | return; |
140 | } | 140 | } |
141 | 141 | ||
142 | GNUNET_TESTBED_test_run ("gnunet-consensus-start-peers", | 142 | (void) GNUNET_TESTBED_test_run ("gnunet-consensus-start-peers", |
143 | config_template_file, | 143 | config_template_file, |
144 | num_peers_requested, | 144 | num_peers_requested, |
145 | 0, | 145 | 0, |
146 | controller_cb, | 146 | controller_cb, |
147 | NULL, | 147 | NULL, |
148 | test_master, | 148 | test_master, |
149 | NULL); | 149 | NULL); |
150 | } | 150 | } |
151 | 151 | ||
152 | 152 | ||
diff --git a/src/dht/dht_test_lib.c b/src/dht/dht_test_lib.c index 5fe34addf..365804b71 100644 --- a/src/dht/dht_test_lib.c +++ b/src/dht/dht_test_lib.c | |||
@@ -204,11 +204,11 @@ GNUNET_DHT_TEST_run (const char *testname, | |||
204 | ctx->dhts = GNUNET_malloc (num_peers * sizeof (struct GNUNET_DHT_Handle *)); | 204 | ctx->dhts = GNUNET_malloc (num_peers * sizeof (struct GNUNET_DHT_Handle *)); |
205 | ctx->app_main = tmain; | 205 | ctx->app_main = tmain; |
206 | ctx->app_main_cls = tmain_cls; | 206 | ctx->app_main_cls = tmain_cls; |
207 | GNUNET_TESTBED_test_run (testname, | 207 | (void) GNUNET_TESTBED_test_run (testname, |
208 | cfgname, | 208 | cfgname, |
209 | num_peers, | 209 | num_peers, |
210 | 0LL, NULL, NULL, | 210 | 0LL, NULL, NULL, |
211 | &dht_test_run, ctx); | 211 | &dht_test_run, ctx); |
212 | } | 212 | } |
213 | 213 | ||
214 | /* end of dht_test_lib.c */ | 214 | /* end of dht_test_lib.c */ |
diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c index dadeaba6f..6c84d1545 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.c +++ b/src/fs/perf_gnunet_service_fs_p2p.c | |||
@@ -325,11 +325,11 @@ int | |||
325 | main (int argc, char *argv[]) | 325 | main (int argc, char *argv[]) |
326 | { | 326 | { |
327 | progname = argv[0]; | 327 | progname = argv[0]; |
328 | GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p", | 328 | (void) GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p", |
329 | "perf_gnunet_service_fs_p2p.conf", | 329 | "perf_gnunet_service_fs_p2p.conf", |
330 | NUM_DAEMONS, | 330 | NUM_DAEMONS, |
331 | 0, NULL, NULL, | 331 | 0, NULL, NULL, |
332 | &do_publish, NULL); | 332 | &do_publish, NULL); |
333 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); | 333 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); |
334 | return ok; | 334 | return ok; |
335 | } | 335 | } |
diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c index 0437f68a6..11fb0b540 100644 --- a/src/fs/perf_gnunet_service_fs_p2p_respect.c +++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c | |||
@@ -435,11 +435,11 @@ int | |||
435 | main (int argc, char *argv[]) | 435 | main (int argc, char *argv[]) |
436 | { | 436 | { |
437 | progname = argv[0]; | 437 | progname = argv[0]; |
438 | GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p-respect", | 438 | (void) GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p-respect", |
439 | "perf_gnunet_service_fs_p2p.conf", | 439 | "perf_gnunet_service_fs_p2p.conf", |
440 | NUM_DAEMONS, | 440 | NUM_DAEMONS, |
441 | 0, NULL, NULL, | 441 | 0, NULL, NULL, |
442 | &do_connect, NULL); | 442 | &do_connect, NULL); |
443 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); | 443 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); |
444 | return ok; | 444 | return ok; |
445 | } | 445 | } |
diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c index bee7909a9..011ee1a6a 100644 --- a/src/fs/test_fs_test_lib.c +++ b/src/fs/test_fs_test_lib.c | |||
@@ -139,11 +139,11 @@ int | |||
139 | main (int argc, char *argv[]) | 139 | main (int argc, char *argv[]) |
140 | { | 140 | { |
141 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); | 141 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); |
142 | GNUNET_TESTBED_test_run ("test_fs_test_lib", | 142 | (void) GNUNET_TESTBED_test_run ("test_fs_test_lib", |
143 | "fs_test_lib_data.conf", | 143 | "fs_test_lib_data.conf", |
144 | NUM_DAEMONS, | 144 | NUM_DAEMONS, |
145 | 0, NULL, NULL, | 145 | 0, NULL, NULL, |
146 | &run, NULL); | 146 | &run, NULL); |
147 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); | 147 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); |
148 | return ret; | 148 | return ret; |
149 | } | 149 | } |
diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c index 5165934f0..7ffa94a98 100644 --- a/src/fs/test_gnunet_service_fs_migration.c +++ b/src/fs/test_gnunet_service_fs_migration.c | |||
@@ -160,12 +160,12 @@ do_publish (void *cls, | |||
160 | int | 160 | int |
161 | main (int argc, char *argv[]) | 161 | main (int argc, char *argv[]) |
162 | { | 162 | { |
163 | GNUNET_TESTBED_test_run ("test-gnunet-service-fs-migration", | 163 | (void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-migration", |
164 | "fs_test_lib_data.conf", | 164 | "fs_test_lib_data.conf", |
165 | 2, | 165 | 2, |
166 | 0, NULL, NULL, | 166 | 0, NULL, NULL, |
167 | &do_publish, | 167 | &do_publish, |
168 | NULL); | 168 | NULL); |
169 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/"); | 169 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/"); |
170 | return ok; | 170 | return ok; |
171 | } | 171 | } |
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c index 34326fa70..889337ff4 100644 --- a/src/fs/test_gnunet_service_fs_p2p.c +++ b/src/fs/test_gnunet_service_fs_p2p.c | |||
@@ -136,11 +136,11 @@ main (int argc, char *argv[]) | |||
136 | config = "test_gnunet_service_fs_p2p_stream.conf"; | 136 | config = "test_gnunet_service_fs_p2p_stream.conf"; |
137 | else | 137 | else |
138 | config = "fs_test_lib_data.conf"; | 138 | config = "fs_test_lib_data.conf"; |
139 | GNUNET_TESTBED_test_run ("test-gnunet-service-fs-p2p", | 139 | (void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-p2p", |
140 | config, | 140 | config, |
141 | NUM_DAEMONS, | 141 | NUM_DAEMONS, |
142 | 0, NULL, NULL, | 142 | 0, NULL, NULL, |
143 | &do_publish, NULL); | 143 | &do_publish, NULL); |
144 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); | 144 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); |
145 | return ok; | 145 | return ok; |
146 | } | 146 | } |
diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c index 59d826cf9..ecfe36e44 100644 --- a/src/gns/test_gns_dht_three_peers.c +++ b/src/gns/test_gns_dht_three_peers.c | |||
@@ -632,10 +632,10 @@ main (int argc, char *argv[]) | |||
632 | event_mask = 0; | 632 | event_mask = 0; |
633 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); | 633 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); |
634 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); | 634 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); |
635 | GNUNET_TESTBED_test_run ("test_gns_dht_three_peers", "test_gns_dht_default.conf", | 635 | (void) GNUNET_TESTBED_test_run ("test_gns_dht_three_peers", "test_gns_dht_default.conf", |
636 | 3, event_mask, | 636 | 3, event_mask, |
637 | &testbed_controller_cb, NULL, | 637 | &testbed_controller_cb, NULL, |
638 | &testbed_master, NULL); | 638 | &testbed_master, NULL); |
639 | if (GNUNET_SYSERR == ok) | 639 | if (GNUNET_SYSERR == ok) |
640 | return 1; | 640 | return 1; |
641 | return 0; | 641 | return 0; |
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index 645bfa37c..c128f29d2 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h | |||
@@ -1444,8 +1444,9 @@ typedef void (*GNUNET_TESTBED_TestMaster)(void *cls, | |||
1444 | * @param cc_cls closure for cc | 1444 | * @param cc_cls closure for cc |
1445 | * @param test_master task to run once the test is ready | 1445 | * @param test_master task to run once the test is ready |
1446 | * @param test_master_cls closure for 'task'. | 1446 | * @param test_master_cls closure for 'task'. |
1447 | * @param GNUNET_SYSERR on error, GNUNET_OK on success | ||
1447 | */ | 1448 | */ |
1448 | void | 1449 | int |
1449 | GNUNET_TESTBED_test_run (const char *testname, | 1450 | GNUNET_TESTBED_test_run (const char *testname, |
1450 | const char *cfg_filename, | 1451 | const char *cfg_filename, |
1451 | unsigned int num_peers, | 1452 | unsigned int num_peers, |
diff --git a/src/nse/test_nse_multipeer.c b/src/nse/test_nse_multipeer.c index 13307425c..2b8c367ce 100644 --- a/src/nse/test_nse_multipeer.c +++ b/src/nse/test_nse_multipeer.c | |||
@@ -214,11 +214,11 @@ int | |||
214 | main (int argc, char *argv[]) | 214 | main (int argc, char *argv[]) |
215 | { | 215 | { |
216 | ok = 1; | 216 | ok = 1; |
217 | GNUNET_TESTBED_test_run ("test-nse-multipeer", | 217 | (void) GNUNET_TESTBED_test_run ("test-nse-multipeer", |
218 | "test_nse.conf", | 218 | "test_nse.conf", |
219 | NUM_PEERS, | 219 | NUM_PEERS, |
220 | 0, NULL, NULL, | 220 | 0, NULL, NULL, |
221 | &run, NULL); | 221 | &run, NULL); |
222 | return ok; | 222 | return ok; |
223 | } | 223 | } |
224 | 224 | ||
diff --git a/src/stream/perf_stream_api.c b/src/stream/perf_stream_api.c index a3f188a8f..9150ca6e9 100644 --- a/src/stream/perf_stream_api.c +++ b/src/stream/perf_stream_api.c | |||
@@ -1032,8 +1032,9 @@ int main (int argc, char **argv) | |||
1032 | (void) memset (peer_data, 0, sizeof (peer_data)); | 1032 | (void) memset (peer_data, 0, sizeof (peer_data)); |
1033 | result = INIT; | 1033 | result = INIT; |
1034 | reset_read = GNUNET_NO; | 1034 | reset_read = GNUNET_NO; |
1035 | GNUNET_TESTBED_test_run (test_name, cfg_file, num_peers, event_mask, | 1035 | (void) GNUNET_TESTBED_test_run (test_name, cfg_file, num_peers, event_mask, |
1036 | &controller_event_cb, NULL, &test_master, NULL); | 1036 | &controller_event_cb, NULL, &test_master, |
1037 | NULL); | ||
1037 | if (DOWNLINK_OK != result) | 1038 | if (DOWNLINK_OK != result) |
1038 | goto return_fail; | 1039 | goto return_fail; |
1039 | } | 1040 | } |
diff --git a/src/stream/test_stream_2peers.c b/src/stream/test_stream_2peers.c index 1dd15fdd1..9eff08af4 100644 --- a/src/stream/test_stream_2peers.c +++ b/src/stream/test_stream_2peers.c | |||
@@ -662,9 +662,11 @@ int main (int argc, char **argv) | |||
662 | event_mask = 0; | 662 | event_mask = 0; |
663 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); | 663 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); |
664 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); | 664 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); |
665 | GNUNET_TESTBED_test_run ("test_stream_2peers", "test_stream_local.conf", | 665 | (void) GNUNET_TESTBED_test_run ("test_stream_2peers", |
666 | NUM_PEERS, event_mask, &controller_event_cb, NULL, | 666 | "test_stream_local.conf", |
667 | &test_master, NULL); | 667 | NUM_PEERS, event_mask, &controller_event_cb, |
668 | NULL, | ||
669 | &test_master, NULL); | ||
668 | if (GNUNET_SYSERR == result) | 670 | if (GNUNET_SYSERR == result) |
669 | return 1; | 671 | return 1; |
670 | return 0; | 672 | return 0; |
diff --git a/src/stream/test_stream_2peers_halfclose.c b/src/stream/test_stream_2peers_halfclose.c index 852880868..58f9f19cf 100644 --- a/src/stream/test_stream_2peers_halfclose.c +++ b/src/stream/test_stream_2peers_halfclose.c | |||
@@ -884,9 +884,11 @@ int main (int argc, char **argv) | |||
884 | event_mask = 0; | 884 | event_mask = 0; |
885 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); | 885 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); |
886 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); | 886 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); |
887 | GNUNET_TESTBED_test_run ("test_stream_2peers_halfclose", | 887 | (void) GNUNET_TESTBED_test_run ("test_stream_2peers_halfclose", |
888 | "test_stream_local.conf", NUM_PEERS, event_mask, | 888 | "test_stream_local.conf", NUM_PEERS, |
889 | &controller_event_cb, NULL, &test_master, NULL); | 889 | event_mask, |
890 | &controller_event_cb, NULL, &test_master, | ||
891 | NULL); | ||
890 | if (GNUNET_SYSERR == result) | 892 | if (GNUNET_SYSERR == result) |
891 | return 1; | 893 | return 1; |
892 | return 0; | 894 | return 0; |
diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c index 1738c0a98..e4cee9ab0 100644 --- a/src/testbed/test_testbed_api_test.c +++ b/src/testbed/test_testbed_api_test.c | |||
@@ -228,9 +228,11 @@ main (int argc, char **argv) | |||
228 | event_mask = 0; | 228 | event_mask = 0; |
229 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); | 229 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); |
230 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); | 230 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); |
231 | GNUNET_TESTBED_test_run ("test_testbed_api_test", "test_testbed_api.conf", | 231 | (void) GNUNET_TESTBED_test_run ("test_testbed_api_test", |
232 | NUM_PEERS, event_mask, &controller_event_cb, NULL, | 232 | "test_testbed_api.conf", |
233 | &test_master, NULL); | 233 | NUM_PEERS, event_mask, &controller_event_cb, |
234 | NULL, | ||
235 | &test_master, NULL); | ||
234 | if (GNUNET_OK != result) | 236 | if (GNUNET_OK != result) |
235 | return 1; | 237 | return 1; |
236 | return 0; | 238 | return 0; |
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index 5efaf8137..d3ce82895 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.c | |||
@@ -156,9 +156,11 @@ main (int argc, char **argv) | |||
156 | event_mask = 0; | 156 | event_mask = 0; |
157 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); | 157 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); |
158 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); | 158 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); |
159 | GNUNET_TESTBED_test_run ("test_testbed_api_test", "test_testbed_api.conf", | 159 | (void) GNUNET_TESTBED_test_run ("test_testbed_api_test", |
160 | NUM_PEERS, event_mask, &controller_event_cb, NULL, | 160 | "test_testbed_api.conf", |
161 | &test_master, NULL); | 161 | NUM_PEERS, event_mask, &controller_event_cb, |
162 | NULL, | ||
163 | &test_master, NULL); | ||
162 | if (GNUNET_OK != result) | 164 | if (GNUNET_OK != result) |
163 | return 1; | 165 | return 1; |
164 | return 0; | 166 | return 0; |
diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c index 2fbf48729..0304fe33e 100644 --- a/src/testbed/test_testbed_api_topology_clique.c +++ b/src/testbed/test_testbed_api_topology_clique.c | |||
@@ -154,9 +154,11 @@ main (int argc, char **argv) | |||
154 | event_mask = 0; | 154 | event_mask = 0; |
155 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); | 155 | event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); |
156 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); | 156 | event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); |
157 | GNUNET_TESTBED_test_run ("test_testbed_api_test", "test_testbed_api.conf", | 157 | (void) GNUNET_TESTBED_test_run ("test_testbed_api_test", |
158 | NUM_PEERS, event_mask, &controller_event_cb, NULL, | 158 | "test_testbed_api.conf", |
159 | &test_master, NULL); | 159 | NUM_PEERS, event_mask, &controller_event_cb, |
160 | NULL, | ||
161 | &test_master, NULL); | ||
160 | if (GNUNET_OK != result) | 162 | if (GNUNET_OK != result) |
161 | return 1; | 163 | return 1; |
162 | return 0; | 164 | return 0; |
diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c index 580917aa7..0fa55fa36 100644 --- a/src/testbed/testbed_api_test.c +++ b/src/testbed/testbed_api_test.c | |||
@@ -168,7 +168,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
168 | * @param test_master task to run once the test is ready | 168 | * @param test_master task to run once the test is ready |
169 | * @param test_master_cls closure for 'task'. | 169 | * @param test_master_cls closure for 'task'. |
170 | */ | 170 | */ |
171 | void | 171 | int |
172 | GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename, | 172 | GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename, |
173 | unsigned int num_peers, | 173 | unsigned int num_peers, |
174 | uint64_t event_mask, | 174 | uint64_t event_mask, |
@@ -187,6 +187,7 @@ GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename, | |||
187 | GNUNET_GETOPT_OPTION_END | 187 | GNUNET_GETOPT_OPTION_END |
188 | }; | 188 | }; |
189 | struct TestRunContext *rc; | 189 | struct TestRunContext *rc; |
190 | int ret; | ||
190 | 191 | ||
191 | argv2[0] = GNUNET_strdup (testname); | 192 | argv2[0] = GNUNET_strdup (testname); |
192 | argv2[2] = GNUNET_strdup (cfg_filename); | 193 | argv2[2] = GNUNET_strdup (cfg_filename); |
@@ -200,11 +201,12 @@ GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename, | |||
200 | rc->event_mask = event_mask; | 201 | rc->event_mask = event_mask; |
201 | rc->cc = cc; | 202 | rc->cc = cc; |
202 | rc->cc_cls = cc_cls; | 203 | rc->cc_cls = cc_cls; |
203 | (void) GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, | 204 | ret = GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, |
204 | testname, "nohelp", options, &run, rc); | 205 | testname, "nohelp", options, &run, rc); |
205 | GNUNET_free (rc); | 206 | GNUNET_free (rc); |
206 | GNUNET_free (argv2[0]); | 207 | GNUNET_free (argv2[0]); |
207 | GNUNET_free (argv2[2]); | 208 | GNUNET_free (argv2[2]); |
209 | return ret; | ||
208 | } | 210 | } |
209 | 211 | ||
210 | /* end of testbed_api_test.c */ | 212 | /* end of testbed_api_test.c */ |
diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c index be2875fe5..ae35da381 100644 --- a/src/topology/test_gnunet_daemon_topology.c +++ b/src/topology/test_gnunet_daemon_topology.c | |||
@@ -82,11 +82,11 @@ do_connect (void *cls, | |||
82 | int | 82 | int |
83 | main (int argc, char *argv[]) | 83 | main (int argc, char *argv[]) |
84 | { | 84 | { |
85 | GNUNET_TESTBED_test_run ("test-gnunet-daemon-topology", | 85 | (void) GNUNET_TESTBED_test_run ("test-gnunet-daemon-topology", |
86 | "test_gnunet_daemon_topology_data.conf", | 86 | "test_gnunet_daemon_topology_data.conf", |
87 | NUM_PEERS, | 87 | NUM_PEERS, |
88 | 0, NULL, NULL, | 88 | 0, NULL, NULL, |
89 | &do_connect, NULL); | 89 | &do_connect, NULL); |
90 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-topology"); | 90 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-topology"); |
91 | return ok; | 91 | return ok; |
92 | } | 92 | } |