diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-12-12 16:51:55 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-12-12 16:51:55 +0000 |
commit | e7e67e04dc6afb06cf752c774a4b98a575da5db9 (patch) | |
tree | 91613b345d2ae4f53543574c0c38ed16e9ad12de /src | |
parent | 01d45e771a08a870b6852056d653a75c64ff1528 (diff) | |
download | gnunet-e7e67e04dc6afb06cf752c774a4b98a575da5db9.tar.gz gnunet-e7e67e04dc6afb06cf752c774a4b98a575da5db9.zip |
Run testbed-helper in a sh interactive session to make sure the env is set up properly
Diffstat (limited to 'src')
-rw-r--r-- | src/testbed/gnunet-testbed-profiler.c | 2 | ||||
-rw-r--r-- | src/testbed/testbed_api.c | 6 |
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, | |||
781 | GNUNET_TESTBED_HostHabitableCheckHandle *) | 781 | GNUNET_TESTBED_HostHabitableCheckHandle *) |
782 | * num_hosts); | 782 | * num_hosts); |
783 | for (nhost = 0; nhost < num_hosts; nhost++) | 783 | for (nhost = 0; nhost < num_hosts; nhost++) |
784 | { | 784 | { |
785 | if (NULL == (hc_handles[nhost] = GNUNET_TESTBED_is_host_habitable (hosts[nhost], config, | 785 | if (NULL == (hc_handles[nhost] = GNUNET_TESTBED_is_host_habitable (hosts[nhost], config, |
786 | &host_habitable_cb, | 786 | &host_habitable_cb, |
787 | &hc_handles[nhost]))) | 787 | &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, | |||
1402 | else | 1402 | else |
1403 | { | 1403 | { |
1404 | char *helper_binary_path; | 1404 | char *helper_binary_path; |
1405 | const char *remote_args[10]; | 1405 | const char *remote_args[12]; |
1406 | const char *username; | 1406 | const char *username; |
1407 | char *port; | 1407 | char *port; |
1408 | char *dst; | 1408 | char *dst; |
@@ -1429,9 +1429,11 @@ GNUNET_TESTBED_controller_start (const char *controller_ip, | |||
1429 | "HELPER_BINARY_PATH", | 1429 | "HELPER_BINARY_PATH", |
1430 | &helper_binary_path)) | 1430 | &helper_binary_path)) |
1431 | helper_binary_path = GNUNET_OS_get_libexec_binary_path (HELPER_TESTBED_BINARY); | 1431 | helper_binary_path = GNUNET_OS_get_libexec_binary_path (HELPER_TESTBED_BINARY); |
1432 | remote_args[argp++] = "sh"; | ||
1433 | remote_args[argp++] = "-lc"; | ||
1432 | remote_args[argp++] = helper_binary_path; | 1434 | remote_args[argp++] = helper_binary_path; |
1433 | remote_args[argp++] = NULL; | 1435 | remote_args[argp++] = NULL; |
1434 | GNUNET_assert (argp == 10); | 1436 | GNUNET_assert (argp == 12); |
1435 | cp->helper_argv = copy_argv (remote_args); | 1437 | cp->helper_argv = copy_argv (remote_args); |
1436 | GNUNET_free (port); | 1438 | GNUNET_free (port); |
1437 | GNUNET_free (dst); | 1439 | GNUNET_free (dst); |