Run testbed-helper in a sh interactive session to make sure the env is set up properly

2 files changed, 5 insertions, 3 deletions

diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 4b8a95849..04dd6cbd6 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -781,7 +781,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                       GNUNET_TESTBED_HostHabitableCheckHandle *) 
                               * num_hosts);
   for (nhost = 0; nhost < num_hosts; nhost++)
-  {    
+  {
     if (NULL == (hc_handles[nhost] = GNUNET_TESTBED_is_host_habitable (hosts[nhost], config,
                                                                        &host_habitable_cb,
                                                                        &hc_handles[nhost])))
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index a1be406cf..16e9e66d8 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1402,7 +1402,7 @@ GNUNET_TESTBED_controller_start (const char *controller_ip,
   else
   {
     char *helper_binary_path;
-    const char *remote_args[10];
+    const char *remote_args[12];
     const char *username;
     char *port;
     char *dst;
@@ -1429,9 +1429,11 @@ GNUNET_TESTBED_controller_start (const char *controller_ip,
                                                             "HELPER_BINARY_PATH",
                                                             &helper_binary_path))
       helper_binary_path = GNUNET_OS_get_libexec_binary_path (HELPER_TESTBED_BINARY);
+    remote_args[argp++] = "sh";
+    remote_args[argp++] = "-lc";
     remote_args[argp++] = helper_binary_path;
     remote_args[argp++] = NULL;
-    GNUNET_assert (argp == 10);
+    GNUNET_assert (argp == 12);
     cp->helper_argv = copy_argv (remote_args);
     GNUNET_free (port);
     GNUNET_free (dst);