[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25390 - in gnunet/src: consensus dht fs gns include nse st
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r25390 - in gnunet/src: consensus dht fs gns include nse stream testbed topology |
|
Date: |
Tue, 11 Dec 2012 13:27:41 +0100 |
Author: harsha
Date: 2012-12-11 13:27:41 +0100 (Tue, 11 Dec 2012)
New Revision: 25390
Modified:
gnunet/src/consensus/gnunet-consensus-start-peers.c
gnunet/src/dht/dht_test_lib.c
gnunet/src/fs/perf_gnunet_service_fs_p2p.c
gnunet/src/fs/perf_gnunet_service_fs_p2p_respect.c
gnunet/src/fs/test_fs_test_lib.c
gnunet/src/fs/test_gnunet_service_fs_migration.c
gnunet/src/fs/test_gnunet_service_fs_p2p.c
gnunet/src/gns/test_gns_dht_three_peers.c
gnunet/src/include/gnunet_testbed_service.h
gnunet/src/nse/test_nse_multipeer.c
gnunet/src/stream/perf_stream_api.c
gnunet/src/stream/test_stream_2peers.c
gnunet/src/stream/test_stream_2peers_halfclose.c
gnunet/src/testbed/test_testbed_api_test.c
gnunet/src/testbed/test_testbed_api_topology.c
gnunet/src/testbed/test_testbed_api_topology_clique.c
gnunet/src/testbed/testbed_api_test.c
gnunet/src/topology/test_gnunet_daemon_topology.c
Log:
GNUNET_TESTBED_test_run to return status
Modified: gnunet/src/consensus/gnunet-consensus-start-peers.c
===================================================================
--- gnunet/src/consensus/gnunet-consensus-start-peers.c 2012-12-11 11:21:31 UTC
(rev 25389)
+++ gnunet/src/consensus/gnunet-consensus-start-peers.c 2012-12-11 12:27:41 UTC
(rev 25390)
@@ -139,14 +139,14 @@
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);
}
Modified: gnunet/src/dht/dht_test_lib.c
===================================================================
--- gnunet/src/dht/dht_test_lib.c 2012-12-11 11:21:31 UTC (rev 25389)
+++ gnunet/src/dht/dht_test_lib.c 2012-12-11 12:27:41 UTC (rev 25390)
@@ -204,11 +204,11 @@
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 */
Modified: gnunet/src/fs/perf_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p.c 2012-12-11 11:21:31 UTC (rev
25389)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p.c 2012-12-11 12:27:41 UTC (rev
25390)
@@ -325,11 +325,11 @@
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;
}
Modified: gnunet/src/fs/perf_gnunet_service_fs_p2p_respect.c
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p_respect.c 2012-12-11 11:21:31 UTC
(rev 25389)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p_respect.c 2012-12-11 12:27:41 UTC
(rev 25390)
@@ -435,11 +435,11 @@
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;
}
Modified: gnunet/src/fs/test_fs_test_lib.c
===================================================================
--- gnunet/src/fs/test_fs_test_lib.c 2012-12-11 11:21:31 UTC (rev 25389)
+++ gnunet/src/fs/test_fs_test_lib.c 2012-12-11 12:27:41 UTC (rev 25390)
@@ -139,11 +139,11 @@
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;
}
Modified: gnunet/src/fs/test_gnunet_service_fs_migration.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_migration.c 2012-12-11 11:21:31 UTC
(rev 25389)
+++ gnunet/src/fs/test_gnunet_service_fs_migration.c 2012-12-11 12:27:41 UTC
(rev 25390)
@@ -160,12 +160,12 @@
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;
}
Modified: gnunet/src/fs/test_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_p2p.c 2012-12-11 11:21:31 UTC (rev
25389)
+++ gnunet/src/fs/test_gnunet_service_fs_p2p.c 2012-12-11 12:27:41 UTC (rev
25390)
@@ -136,11 +136,11 @@
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;
}
Modified: gnunet/src/gns/test_gns_dht_three_peers.c
===================================================================
--- gnunet/src/gns/test_gns_dht_three_peers.c 2012-12-11 11:21:31 UTC (rev
25389)
+++ gnunet/src/gns/test_gns_dht_three_peers.c 2012-12-11 12:27:41 UTC (rev
25390)
@@ -632,10 +632,10 @@
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;
Modified: gnunet/src/include/gnunet_testbed_service.h
===================================================================
--- gnunet/src/include/gnunet_testbed_service.h 2012-12-11 11:21:31 UTC (rev
25389)
+++ gnunet/src/include/gnunet_testbed_service.h 2012-12-11 12:27:41 UTC (rev
25390)
@@ -1444,8 +1444,9 @@
* @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,
Modified: gnunet/src/nse/test_nse_multipeer.c
===================================================================
--- gnunet/src/nse/test_nse_multipeer.c 2012-12-11 11:21:31 UTC (rev 25389)
+++ gnunet/src/nse/test_nse_multipeer.c 2012-12-11 12:27:41 UTC (rev 25390)
@@ -214,11 +214,11 @@
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;
}
Modified: gnunet/src/stream/perf_stream_api.c
===================================================================
--- gnunet/src/stream/perf_stream_api.c 2012-12-11 11:21:31 UTC (rev 25389)
+++ gnunet/src/stream/perf_stream_api.c 2012-12-11 12:27:41 UTC (rev 25390)
@@ -1032,8 +1032,9 @@
(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;
}
Modified: gnunet/src/stream/test_stream_2peers.c
===================================================================
--- gnunet/src/stream/test_stream_2peers.c 2012-12-11 11:21:31 UTC (rev
25389)
+++ gnunet/src/stream/test_stream_2peers.c 2012-12-11 12:27:41 UTC (rev
25390)
@@ -662,9 +662,11 @@
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;
Modified: gnunet/src/stream/test_stream_2peers_halfclose.c
===================================================================
--- gnunet/src/stream/test_stream_2peers_halfclose.c 2012-12-11 11:21:31 UTC
(rev 25389)
+++ gnunet/src/stream/test_stream_2peers_halfclose.c 2012-12-11 12:27:41 UTC
(rev 25390)
@@ -884,9 +884,11 @@
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;
Modified: gnunet/src/testbed/test_testbed_api_test.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_test.c 2012-12-11 11:21:31 UTC (rev
25389)
+++ gnunet/src/testbed/test_testbed_api_test.c 2012-12-11 12:27:41 UTC (rev
25390)
@@ -228,9 +228,11 @@
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;
Modified: gnunet/src/testbed/test_testbed_api_topology.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_topology.c 2012-12-11 11:21:31 UTC
(rev 25389)
+++ gnunet/src/testbed/test_testbed_api_topology.c 2012-12-11 12:27:41 UTC
(rev 25390)
@@ -156,9 +156,11 @@
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;
Modified: gnunet/src/testbed/test_testbed_api_topology_clique.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_topology_clique.c 2012-12-11
11:21:31 UTC (rev 25389)
+++ gnunet/src/testbed/test_testbed_api_topology_clique.c 2012-12-11
12:27:41 UTC (rev 25390)
@@ -154,9 +154,11 @@
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;
Modified: gnunet/src/testbed/testbed_api_test.c
===================================================================
--- gnunet/src/testbed/testbed_api_test.c 2012-12-11 11:21:31 UTC (rev
25389)
+++ gnunet/src/testbed/testbed_api_test.c 2012-12-11 12:27:41 UTC (rev
25390)
@@ -168,7 +168,7 @@
* @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_GETOPT_OPTION_END
};
struct TestRunContext *rc;
+ int ret;
argv2[0] = GNUNET_strdup (testname);
argv2[2] = GNUNET_strdup (cfg_filename);
@@ -200,11 +201,12 @@
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 */
Modified: gnunet/src/topology/test_gnunet_daemon_topology.c
===================================================================
--- gnunet/src/topology/test_gnunet_daemon_topology.c 2012-12-11 11:21:31 UTC
(rev 25389)
+++ gnunet/src/topology/test_gnunet_daemon_topology.c 2012-12-11 12:27:41 UTC
(rev 25390)
@@ -82,11 +82,11 @@
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;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25390 - in gnunet/src: consensus dht fs gns include nse stream testbed topology,
gnunet <=