- generate test_testbed_api_barriers.conf in the testcase

3 files changed, 22 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 9f4e56435..eb51286c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1347,7 +1347,6 @@ src/statistics/statistics.conf
 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
diff --git a/src/testbed/test_testbed_api_barriers.c b/src/testbed/test_testbed_api_barriers.c
index 35fda4b31..a0c6230b4 100644
--- a/src/testbed/test_testbed_api_barriers.c
+++ b/src/testbed/test_testbed_api_barriers.c
@@ -173,14 +173,33 @@ test_master (void *cls,
 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;
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index ba59aff99..720e1f199 100644
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -12,13 +12,14 @@ PORT = 12366
 
 [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]