[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29332 - in gnunet: . src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29332 - in gnunet: . src/testbed |
Date: |
Mon, 16 Sep 2013 18:32:32 +0200 |
Author: harsha
Date: 2013-09-16 18:32:31 +0200 (Mon, 16 Sep 2013)
New Revision: 29332
Modified:
gnunet/configure.ac
gnunet/src/testbed/test_testbed_api_barriers.c
gnunet/src/testbed/test_testbed_api_barriers.conf.in
Log:
- generate test_testbed_api_barriers.conf in the testcase
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-09-16 16:31:25 UTC (rev 29331)
+++ gnunet/configure.ac 2013-09-16 16:32:31 UTC (rev 29332)
@@ -1347,7 +1347,6 @@
src/template/Makefile
src/testbed/Makefile
src/testbed/testbed.conf
-src/testbed/test_testbed_api_barriers.conf
src/testing/Makefile
src/topology/Makefile
src/transport/Makefile
Modified: gnunet/src/testbed/test_testbed_api_barriers.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_barriers.c 2013-09-16 16:31:25 UTC
(rev 29331)
+++ gnunet/src/testbed/test_testbed_api_barriers.c 2013-09-16 16:32:31 UTC
(rev 29332)
@@ -173,14 +173,33 @@
int
main (int argc, char **argv)
{
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+ char pwd[PATH_MAX];
+ char *binary;
uint64_t event_mask;
result = GNUNET_SYSERR;
event_mask = 0;
+ cfg = GNUNET_CONFIGURATION_create ();
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONFIGURATION_parse (cfg,
+
"test_testbed_api_barriers.conf.in"));
+ if (NULL == getcwd (pwd, PATH_MAX))
+ return 1;
+ GNUNET_assert (0 < GNUNET_asprintf (&binary, "%s/%s", pwd,
+ "gnunet-service-test-barriers"));
+ GNUNET_CONFIGURATION_set_value_string (cfg, "test-barriers","BINARY",
binary);
+ GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write
+ (cfg, "test_testbed_api_barriers.conf"));
+ GNUNET_CONFIGURATION_destroy (cfg);
+ cfg = NULL;
+ GNUNET_free (binary);
+ binary = NULL;
(void) GNUNET_TESTBED_test_run ("test_testbed_api_barriers",
"test_testbed_api_barriers.conf", NUM_PEERS,
event_mask, NULL, NULL,
&test_master, NULL);
+ (void) unlink ("test_testbed_api_barriers.conf");
if (GNUNET_OK != result)
return 1;
return 0;
Modified: gnunet/src/testbed/test_testbed_api_barriers.conf.in
===================================================================
--- gnunet/src/testbed/test_testbed_api_barriers.conf.in 2013-09-16
16:31:25 UTC (rev 29331)
+++ gnunet/src/testbed/test_testbed_api_barriers.conf.in 2013-09-16
16:32:31 UTC (rev 29332)
@@ -12,13 +12,14 @@
[test-barriers]
AUTOSTART = YES
-PORT = 12114 #not really used
-BINARY = @abs_srcdir@/gnunet-service-test-barriers
+PORT = 12114
+BINARY = /will/be/overwriten/in/test_testbed_api_barriers/
[fs]
AUTOSTART = NO
[resolver]
+HOSTNAME = localhost
AUTOSTART = NO
[mesh]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29332 - in gnunet: . src/testbed,
gnunet <=