aboutsummaryrefslogtreecommitdiff
path: root/src/testbed
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2014-02-20 10:35:33 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2014-02-20 10:35:33 +0000
commit2a35e345a204cb357361406f28e07bf9076cb092 (patch)
tree8c51b5dae07a1f3a3a6a13ac6c623e0b0df2a070 /src/testbed
parenta06237deeec4aed38b09f633d7ebbeabb7da4c03 (diff)
downloadgnunet-2a35e345a204cb357361406f28e07bf9076cb092.tar.gz
gnunet-2a35e345a204cb357361406f28e07bf9076cb092.zip
Allow redirection of STDERR when starting processes.
Diffstat (limited to 'src/testbed')
-rw-r--r--src/testbed/gnunet-helper-testbed.c5
-rw-r--r--src/testbed/gnunet_mpi_test.c2
-rw-r--r--src/testbed/gnunet_testbed_mpi_spawn.c2
-rw-r--r--src/testbed/testbed_api_hosts.c2
4 files changed, 6 insertions, 5 deletions
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index e8c70a354..6937d7262 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -461,8 +461,9 @@ tokenizer_cb (void *cls, void *client,
461 } 461 }
462 testbed = 462 testbed =
463 GNUNET_OS_start_process (PIPE_CONTROL, 463 GNUNET_OS_start_process (PIPE_CONTROL,
464 GNUNET_OS_INHERIT_STD_ERR /*verbose? */ , NULL, 464 GNUNET_OS_INHERIT_STD_ERR /*verbose? */ ,
465 NULL, binary, "gnunet-service-testbed", "-c", 465 NULL, NULL, NULL,
466 binary, "gnunet-service-testbed", "-c",
466 config, NULL); 467 config, NULL);
467 GNUNET_free (binary); 468 GNUNET_free (binary);
468 GNUNET_free (config); 469 GNUNET_free (config);
diff --git a/src/testbed/gnunet_mpi_test.c b/src/testbed/gnunet_mpi_test.c
index fded9e2c2..7fe7a75d7 100644
--- a/src/testbed/gnunet_mpi_test.c
+++ b/src/testbed/gnunet_mpi_test.c
@@ -70,7 +70,7 @@ main (int argc, char *argv[])
70 argv2[cnt - 1] = argv[cnt]; 70 argv2[cnt - 1] = argv[cnt];
71 proc = 71 proc =
72 GNUNET_OS_start_process_vap (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL, 72 GNUNET_OS_start_process_vap (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL,
73 NULL, argv2[0], argv2); 73 NULL, NULL, argv2[0], argv2);
74 if (NULL == proc) 74 if (NULL == proc)
75 { 75 {
76 printf ("Cannot exec\n"); 76 printf ("Cannot exec\n");
diff --git a/src/testbed/gnunet_testbed_mpi_spawn.c b/src/testbed/gnunet_testbed_mpi_spawn.c
index d3a78d3d4..41d805471 100644
--- a/src/testbed/gnunet_testbed_mpi_spawn.c
+++ b/src/testbed/gnunet_testbed_mpi_spawn.c
@@ -246,7 +246,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
246 /* Spawn the new process here */ 246 /* Spawn the new process here */
247 LOG (GNUNET_ERROR_TYPE_INFO, _("Spawning process `%s'\n"), argv2[0]); 247 LOG (GNUNET_ERROR_TYPE_INFO, _("Spawning process `%s'\n"), argv2[0]);
248 child = GNUNET_OS_start_process_vap (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL, 248 child = GNUNET_OS_start_process_vap (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL,
249 NULL, 249 NULL, NULL,
250 argv2[0], argv2); 250 argv2[0], argv2);
251 if (NULL == child) 251 if (NULL == child)
252 { 252 {
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 5a5b00e5a..ed3379d88 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -1349,7 +1349,7 @@ GNUNET_TESTBED_is_host_habitable (const struct GNUNET_TESTBED_Host *host,
1349 free_argv (rsh_args); 1349 free_argv (rsh_args);
1350 h->auxp = 1350 h->auxp =
1351 GNUNET_OS_start_process_vap (GNUNET_NO, GNUNET_OS_INHERIT_STD_ERR, NULL, 1351 GNUNET_OS_start_process_vap (GNUNET_NO, GNUNET_OS_INHERIT_STD_ERR, NULL,
1352 NULL, h->helper_argv[0], h->helper_argv); 1352 NULL, NULL, h->helper_argv[0], h->helper_argv);
1353 if (NULL == h->auxp) 1353 if (NULL == h->auxp)
1354 { 1354 {
1355 GNUNET_break (0); /* Cannot exec SSH? */ 1355 GNUNET_break (0); /* Cannot exec SSH? */