GNUNET_TESTBED_test_run to return status

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,
     return;
   }
 
-  GNUNET_TESTBED_test_run ("gnunet-consensus-start-peers",
-                           config_template_file,
-                           num_peers_requested,
-                           0,
-                           controller_cb,
-                           NULL,
-                           test_master,
-                           NULL);
+  (void) GNUNET_TESTBED_test_run ("gnunet-consensus-start-peers",
+                                  config_template_file,
+                                  num_peers_requested,
+                                  0,
+                                  controller_cb,
+                                  NULL,
+                                  test_master,
+                                  NULL);
 }
 
 
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,
   ctx->dhts = GNUNET_malloc (num_peers * sizeof (struct GNUNET_DHT_Handle *));
   ctx->app_main = tmain;
   ctx->app_main_cls = tmain_cls;
-  GNUNET_TESTBED_test_run (testname,
-                           cfgname,
-                           num_peers,
-                           0LL, NULL, NULL,
-                           &dht_test_run, ctx);
+  (void) GNUNET_TESTBED_test_run (testname,
+                                  cfgname,
+                                  num_peers,
+                                  0LL, NULL, NULL,
+                                  &dht_test_run, ctx);
 }
 
 /* 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
 main (int argc, char *argv[])
 {
   progname = argv[0];
-  GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p",
-                           "perf_gnunet_service_fs_p2p.conf",
-                           NUM_DAEMONS,
-                           0, NULL, NULL,
-                           &do_publish, NULL);
+  (void) GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p",
+                                  "perf_gnunet_service_fs_p2p.conf",
+                                  NUM_DAEMONS,
+                                  0, NULL, NULL,
+                                  &do_publish, NULL);
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
   return ok;
 }
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
 main (int argc, char *argv[])
 {
   progname = argv[0];
-  GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p-respect",
-                           "perf_gnunet_service_fs_p2p.conf",
-                           NUM_DAEMONS,
-                           0, NULL, NULL,
-                           &do_connect, NULL);
+  (void) GNUNET_TESTBED_test_run ("perf-gnunet-service-fs-p2p-respect",
+                                  "perf_gnunet_service_fs_p2p.conf",
+                                  NUM_DAEMONS,
+                                  0, NULL, NULL,
+                                  &do_connect, NULL);
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
   return ok;
 }
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
 main (int argc, char *argv[])
 {
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
-  GNUNET_TESTBED_test_run ("test_fs_test_lib",
-                           "fs_test_lib_data.conf",
-                           NUM_DAEMONS, 
-                           0, NULL, NULL,
-                           &run, NULL);
+  (void) GNUNET_TESTBED_test_run ("test_fs_test_lib",
+                                  "fs_test_lib_data.conf",
+                                  NUM_DAEMONS, 
+                                  0, NULL, NULL,
+                                  &run, NULL);
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
   return ret;
 }
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,
 int
 main (int argc, char *argv[])
 {
-  GNUNET_TESTBED_test_run ("test-gnunet-service-fs-migration",
-                           "fs_test_lib_data.conf",
-                           2,
-                           0, NULL, NULL,
-                           &do_publish,
-                           NULL);
+  (void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-migration",
+                                  "fs_test_lib_data.conf",
+                                  2,
+                                  0, NULL, NULL,
+                                  &do_publish,
+                                  NULL);
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/");
   return ok;
 }
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[])
     config = "test_gnunet_service_fs_p2p_stream.conf";
   else
     config = "fs_test_lib_data.conf";
-  GNUNET_TESTBED_test_run ("test-gnunet-service-fs-p2p",
-                           config,
-                           NUM_DAEMONS,
-                           0, NULL, NULL,
-                           &do_publish, NULL);
+  (void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-p2p",
+                                  config,
+                                  NUM_DAEMONS,
+                                  0, NULL, NULL,
+                                  &do_publish, NULL);
   GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
   return ok;
 }
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[])
   event_mask = 0;
   event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  GNUNET_TESTBED_test_run ("test_gns_dht_three_peers", "test_gns_dht_default.conf",
-                           3, event_mask,
-                           &testbed_controller_cb, NULL,
-                           &testbed_master, NULL);
+  (void) GNUNET_TESTBED_test_run ("test_gns_dht_three_peers", "test_gns_dht_default.conf",
+                                  3, event_mask,
+                                  &testbed_controller_cb, NULL,
+                                  &testbed_master, NULL);
   if (GNUNET_SYSERR == ok)
     return 1;
   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,
  * @param cc_cls closure for cc
  * @param test_master task to run once the test is ready
  * @param test_master_cls closure for 'task'.
+ * @param GNUNET_SYSERR on error, GNUNET_OK on success
  */
-void
+int
 GNUNET_TESTBED_test_run (const char *testname,
                          const char *cfg_filename,
                          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
 main (int argc, char *argv[])
 {
   ok = 1;
-  GNUNET_TESTBED_test_run ("test-nse-multipeer",
-                           "test_nse.conf",
-                           NUM_PEERS,
-                           0, NULL, NULL,
-                           &run, NULL);
+  (void) GNUNET_TESTBED_test_run ("test-nse-multipeer",
+                                  "test_nse.conf",
+                                  NUM_PEERS,
+                                  0, NULL, NULL,
+                                  &run, NULL);
   return ok;
 }
 
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)
     (void) memset (peer_data, 0, sizeof (peer_data));
     result = INIT;
     reset_read = GNUNET_NO;
-    GNUNET_TESTBED_test_run (test_name, cfg_file, num_peers, event_mask,
-                             &controller_event_cb, NULL, &test_master, NULL);
+    (void) GNUNET_TESTBED_test_run (test_name, cfg_file, num_peers, event_mask,
+                                    &controller_event_cb, NULL, &test_master, 
+                                    NULL);
     if (DOWNLINK_OK != result)
       goto return_fail;
   }
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)
   event_mask = 0;
   event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  GNUNET_TESTBED_test_run ("test_stream_2peers", "test_stream_local.conf",
-                           NUM_PEERS, event_mask, &controller_event_cb, NULL,
-                           &test_master, NULL);
+  (void) GNUNET_TESTBED_test_run ("test_stream_2peers",
+                                  "test_stream_local.conf",
+                                  NUM_PEERS, event_mask, &controller_event_cb,
+                                  NULL,
+                                  &test_master, NULL);
   if (GNUNET_SYSERR == result)
     return 1;
   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)
   event_mask = 0;
   event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  GNUNET_TESTBED_test_run ("test_stream_2peers_halfclose",
-                           "test_stream_local.conf", NUM_PEERS, event_mask,
-                           &controller_event_cb, NULL, &test_master, NULL);
+  (void) GNUNET_TESTBED_test_run ("test_stream_2peers_halfclose",
+                                  "test_stream_local.conf", NUM_PEERS,
+                                  event_mask,
+                                  &controller_event_cb, NULL, &test_master,
+                                  NULL);
   if (GNUNET_SYSERR == result)
     return 1;
   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)
   event_mask = 0;
   event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  GNUNET_TESTBED_test_run ("test_testbed_api_test", "test_testbed_api.conf",
-                           NUM_PEERS, event_mask, &controller_event_cb, NULL,
-                           &test_master, NULL);
+  (void) GNUNET_TESTBED_test_run ("test_testbed_api_test",
+                                  "test_testbed_api.conf",
+                                  NUM_PEERS, event_mask, &controller_event_cb,
+                                  NULL,
+                                  &test_master, NULL);
   if (GNUNET_OK != result)
     return 1;
   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)
   event_mask = 0;
   event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  GNUNET_TESTBED_test_run ("test_testbed_api_test", "test_testbed_api.conf",
-                           NUM_PEERS, event_mask, &controller_event_cb, NULL,
-                           &test_master, NULL);
+  (void) GNUNET_TESTBED_test_run ("test_testbed_api_test",
+                                  "test_testbed_api.conf", 
+                                  NUM_PEERS, event_mask, &controller_event_cb,
+                                  NULL, 
+                                  &test_master, NULL);
   if (GNUNET_OK != result)
     return 1;
   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)
   event_mask = 0;
   event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  GNUNET_TESTBED_test_run ("test_testbed_api_test", "test_testbed_api.conf",
-                           NUM_PEERS, event_mask, &controller_event_cb, NULL,
-                           &test_master, NULL);
+  (void) GNUNET_TESTBED_test_run ("test_testbed_api_test",
+                                  "test_testbed_api.conf", 
+                                  NUM_PEERS, event_mask, &controller_event_cb,
+                                  NULL, 
+                                  &test_master, NULL);
   if (GNUNET_OK != result)
     return 1;
   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,
  * @param test_master task to run once the test is ready
  * @param test_master_cls closure for 'task'.
  */
-void
+int
 GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename,
                          unsigned int num_peers,
                          uint64_t event_mask,
@@ -187,6 +187,7 @@ GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename,
     GNUNET_GETOPT_OPTION_END
   };
   struct TestRunContext *rc;
+  int ret;
 
   argv2[0] = GNUNET_strdup (testname);
   argv2[2] = GNUNET_strdup (cfg_filename);
@@ -200,11 +201,12 @@ GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename,
   rc->event_mask = event_mask;
   rc->cc = cc;
   rc->cc_cls = cc_cls;
-  (void) GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
-                             testname, "nohelp", options, &run, rc);
+  ret = GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
+                            testname, "nohelp", options, &run, rc);
   GNUNET_free (rc);
   GNUNET_free (argv2[0]);
   GNUNET_free (argv2[2]);
+  return ret;
 }
 
 /* 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,
 int
 main (int argc, char *argv[])
 {
-  GNUNET_TESTBED_test_run ("test-gnunet-daemon-topology",
-                           "test_gnunet_daemon_topology_data.conf",
-                           NUM_PEERS,
-                           0, NULL, NULL,
-                           &do_connect, NULL);
+  (void) GNUNET_TESTBED_test_run ("test-gnunet-daemon-topology",
+                                  "test_gnunet_daemon_topology_data.conf",
+                                  NUM_PEERS,
+                                  0, NULL, NULL,
+                                  &do_connect, NULL);
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-topology");
   return ok;
 }