- ignore GNUNET_TESTING_PREFIX in testbed helper

3 files changed, 29 insertions, 2 deletions

diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index c15116876..910662d3f 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -51,6 +51,13 @@ extern "C"
 #define GNUNET_TESTING_HOSTKEYFILESIZE sizeof (struct GNUNET_CRYPTO_EccPrivateKey)
 
 /**
+ * The environmental variable, if set, that dictates where testing should place
+ * generated peer configurations
+ */
+#define GNUNET_TESTING_PREFIX "GNUNET_TESTING_PREFIX"
+
+
+/**
  * Handle for a system on which GNUnet peers are executed;
  * a system is used for reserving unique paths and ports.
  */
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index f49789a80..0bc6986ab 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -338,6 +338,7 @@ tokenizer_cb (void *cls, void *client,
   char *config;
   char *xconfig;
   char *evstr;
+  char *str;
   size_t config_size;
   uLongf ul_config_size;
   size_t xconfig_size;
@@ -401,8 +402,27 @@ tokenizer_cb (void *cls, void *client,
                     hostname_size);
     hostname[hostname_size] = '\0';
   }
+  /* unset GNUNET_TESTING_PREFIX if present as it is more relevant for testbed */
+  evstr = getenv (GNUNET_TESTING_PREFIX);
+  if (NULL != evstr)
+  {
+#if WINDOWS
+    GNUNET_break (0 == putenv (GNUNET_TESTING_PREFIX "="));
+#else
+    gnunet_break (0 == unsetenv (GNUNET_TESTING_PREFIX));
+#endif
+  }
   test_system =
-      GNUNET_TESTING_system_create ("testbed-helper", trusted_ip, hostname, NULL);
+      GNUNET_TESTING_system_create ("testbed-helper", trusted_ip, hostname,
+                                    NULL);
+  if (NULL != evstr)
+  {
+    GNUNET_assert (0 < GNUNET_asprintf (&str, 
+                                        GNUNET_TESTING_PREFIX "=%s", evstr));
+    putenv (str);
+    /* do not free str will be consumed by putenv */
+    GNUNET_free (evstr);
+  }
   GNUNET_free_non_null (hostname);
   hostname = NULL;
   GNUNET_assert (NULL != test_system);
diff --git a/src/testing/testing.c b/src/testing/testing.c
index 4e60ae0f7..89d4c0f50 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -388,7 +388,7 @@ GNUNET_TESTING_system_create_with_portrange (const char *testdir,
 
   GNUNET_assert (NULL != testdir);
   system = GNUNET_malloc (sizeof (struct GNUNET_TESTING_System));
-  if (NULL == (system->tmppath = getenv ("GNUNET_TESTING_PREFIX")))
+  if (NULL == (system->tmppath = getenv (GNUNET_TESTING_PREFIX)))
     system->tmppath = GNUNET_DISK_mkdtemp (testdir);
   else
     system->tmppath = GNUNET_strdup (system->tmppath);