aboutsummaryrefslogtreecommitdiff
path: root/src/testing_old/testing_group.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing_old/testing_group.c')
-rw-r--r--src/testing_old/testing_group.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/testing_old/testing_group.c b/src/testing_old/testing_group.c
index 086ce2720..62cc185ce 100644
--- a/src/testing_old/testing_group.c
+++ b/src/testing_old/testing_group.c
@@ -2904,7 +2904,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg)
2904 pg->peers[pg_iter].daemon->hostname, 2904 pg->peers[pg_iter].daemon->hostname,
2905 temp_service_path); 2905 temp_service_path);
2906 procarr[pg_iter] = 2906 procarr[pg_iter] =
2907 GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", mytemp, arg, NULL); 2907 GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "scp", "scp", mytemp, arg, NULL);
2908 GNUNET_assert (procarr[pg_iter] != NULL); 2908 GNUNET_assert (procarr[pg_iter] != NULL);
2909 ret = GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: schedule this, throttle! */ 2909 ret = GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: schedule this, throttle! */
2910 GNUNET_OS_process_destroy (procarr[pg_iter]); 2910 GNUNET_OS_process_destroy (procarr[pg_iter]);
@@ -3090,7 +3090,7 @@ create_and_copy_blacklist_files (struct GNUNET_TESTING_PeerGroup *pg,
3090 pg->peers[pg_iter].daemon->hostname, 3090 pg->peers[pg_iter].daemon->hostname,
3091 temp_service_path); 3091 temp_service_path);
3092 procarr[pg_iter] = 3092 procarr[pg_iter] =
3093 GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", mytemp, arg, NULL); 3093 GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "scp", "scp", mytemp, arg, NULL);
3094 GNUNET_assert (procarr[pg_iter] != NULL); 3094 GNUNET_assert (procarr[pg_iter] != NULL);
3095 GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: add scheduled blacklist file copy that parallelizes file copying! */ 3095 GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: add scheduled blacklist file copy that parallelizes file copying! */
3096 3096
@@ -5693,7 +5693,7 @@ start_peer_helper (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
5693 5693
5694 /* FIXME: Doesn't support ssh_port option! */ 5694 /* FIXME: Doesn't support ssh_port option! */
5695 helper->proc = 5695 helper->proc =
5696 GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", arg, 5696 GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "ssh", "ssh", arg,
5697 "peerStartHelper.pl", tempdir, NULL); 5697 "peerStartHelper.pl", tempdir, NULL);
5698 GNUNET_assert (helper->proc != NULL); 5698 GNUNET_assert (helper->proc != NULL);
5699 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "starting peers with cmd ssh %s %s %s\n", 5699 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "starting peers with cmd ssh %s %s %s\n",
@@ -5916,13 +5916,13 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
5916 { 5916 {
5917 GNUNET_asprintf (&ssh_port_str, "%d", pg->hosts[i].sshport); 5917 GNUNET_asprintf (&ssh_port_str, "%d", pg->hosts[i].sshport);
5918 proc = 5918 proc =
5919 GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", "-P", ssh_port_str, 5919 GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "ssh", "ssh", "-P", ssh_port_str,
5920 "-q", 5920 "-q",
5921 arg, "mkdir -p", tmpdir, NULL); 5921 arg, "mkdir -p", tmpdir, NULL);
5922 } 5922 }
5923 else 5923 else
5924 proc = 5924 proc =
5925 GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", arg, "mkdir -p", 5925 GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "ssh", "ssh", arg, "mkdir -p",
5926 tmpdir, NULL); 5926 tmpdir, NULL);
5927 GNUNET_assert (proc != NULL); 5927 GNUNET_assert (proc != NULL);
5928 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 5928 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -6141,7 +6141,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
6141 6141
6142 /* FIXME: Doesn't support ssh_port option! */ 6142 /* FIXME: Doesn't support ssh_port option! */
6143 proc = 6143 proc =
6144 GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "rsync", "rsync", "-r", 6144 GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "rsync", "rsync", "-r",
6145 newservicehome, arg, NULL); 6145 newservicehome, arg, NULL);
6146 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 6146 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
6147 "copying directory with command rsync -r %s %s\n", 6147 "copying directory with command rsync -r %s %s\n",