[GNUnet-SVN] r25429 - gnunet/src/testbed

[gnunet]

Author: bartpolot
Date: 2012-12-12 17:51:55 +0100 (Wed, 12 Dec 2012)
New Revision: 25429

Modified:
   gnunet/src/testbed/gnunet-testbed-profiler.c
   gnunet/src/testbed/testbed_api.c
Log:
Run testbed-helper in a sh interactive session to make sure the env is set up 
properly

Modified: gnunet/src/testbed/gnunet-testbed-profiler.c
===================================================================
--- gnunet/src/testbed/gnunet-testbed-profiler.c        2012-12-12 16:37:12 UTC 
(rev 25428)
+++ gnunet/src/testbed/gnunet-testbed-profiler.c        2012-12-12 16:51:55 UTC 
(rev 25429)
@@ -781,7 +781,7 @@
                                       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])))

Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c    2012-12-12 16:37:12 UTC (rev 25428)
+++ gnunet/src/testbed/testbed_api.c    2012-12-12 16:51:55 UTC (rev 25429)
@@ -1402,7 +1402,7 @@
   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 @@
                                                             
"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);