diff options
Diffstat (limited to 'src/testing/testing_group.c')
-rw-r--r-- | src/testing/testing_group.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 8a3ec44d4..2d0e9ef79 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -2928,7 +2928,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg) | |||
2928 | { | 2928 | { |
2929 | GNUNET_asprintf (&arg, "%s/friends", temp_service_path); | 2929 | GNUNET_asprintf (&arg, "%s/friends", temp_service_path); |
2930 | procarr[pg_iter] = | 2930 | procarr[pg_iter] = |
2931 | GNUNET_OS_start_process (NULL, NULL, "mv", "mv", mytemp, arg, NULL); | 2931 | GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "mv", "mv", mytemp, arg, NULL); |
2932 | GNUNET_assert (procarr[pg_iter] != NULL); | 2932 | GNUNET_assert (procarr[pg_iter] != NULL); |
2933 | #if VERBOSE_TESTING | 2933 | #if VERBOSE_TESTING |
2934 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2934 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -2950,7 +2950,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg) | |||
2950 | pg->peers[pg_iter].daemon->hostname, | 2950 | pg->peers[pg_iter].daemon->hostname, |
2951 | temp_service_path); | 2951 | temp_service_path); |
2952 | procarr[pg_iter] = | 2952 | procarr[pg_iter] = |
2953 | GNUNET_OS_start_process (NULL, NULL, "scp", "scp", mytemp, arg, NULL); | 2953 | GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", mytemp, arg, NULL); |
2954 | GNUNET_assert (procarr[pg_iter] != NULL); | 2954 | GNUNET_assert (procarr[pg_iter] != NULL); |
2955 | ret = GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: schedule this, throttle! */ | 2955 | ret = GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: schedule this, throttle! */ |
2956 | GNUNET_OS_process_close (procarr[pg_iter]); | 2956 | GNUNET_OS_process_close (procarr[pg_iter]); |
@@ -3127,7 +3127,7 @@ create_and_copy_blacklist_files (struct GNUNET_TESTING_PeerGroup *pg, | |||
3127 | { | 3127 | { |
3128 | GNUNET_asprintf (&arg, "%s/blacklist", temp_service_path); | 3128 | GNUNET_asprintf (&arg, "%s/blacklist", temp_service_path); |
3129 | procarr[pg_iter] = | 3129 | procarr[pg_iter] = |
3130 | GNUNET_OS_start_process (NULL, NULL, "mv", "mv", mytemp, arg, NULL); | 3130 | GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "mv", "mv", mytemp, arg, NULL); |
3131 | #if VERBOSE_TESTING | 3131 | #if VERBOSE_TESTING |
3132 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 3132 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
3133 | _("Copying file with command cp %s %s\n"), mytemp, arg); | 3133 | _("Copying file with command cp %s %s\n"), mytemp, arg); |
@@ -3147,7 +3147,7 @@ create_and_copy_blacklist_files (struct GNUNET_TESTING_PeerGroup *pg, | |||
3147 | pg->peers[pg_iter].daemon->hostname, | 3147 | pg->peers[pg_iter].daemon->hostname, |
3148 | temp_service_path); | 3148 | temp_service_path); |
3149 | procarr[pg_iter] = | 3149 | procarr[pg_iter] = |
3150 | GNUNET_OS_start_process (NULL, NULL, "scp", "scp", mytemp, arg, NULL); | 3150 | GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", mytemp, arg, NULL); |
3151 | GNUNET_assert (procarr[pg_iter] != NULL); | 3151 | GNUNET_assert (procarr[pg_iter] != NULL); |
3152 | GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: add scheduled blacklist file copy that parallelizes file copying! */ | 3152 | GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: add scheduled blacklist file copy that parallelizes file copying! */ |
3153 | 3153 | ||
@@ -5806,7 +5806,7 @@ start_peer_helper (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
5806 | 5806 | ||
5807 | /* FIXME: Doesn't support ssh_port option! */ | 5807 | /* FIXME: Doesn't support ssh_port option! */ |
5808 | helper->proc = | 5808 | helper->proc = |
5809 | GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh", arg, | 5809 | GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", arg, |
5810 | "peerStartHelper.pl", tempdir, NULL); | 5810 | "peerStartHelper.pl", tempdir, NULL); |
5811 | GNUNET_assert (helper->proc != NULL); | 5811 | GNUNET_assert (helper->proc != NULL); |
5812 | #if DEBUG_TESTING | 5812 | #if DEBUG_TESTING |
@@ -6031,7 +6031,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
6031 | { | 6031 | { |
6032 | GNUNET_asprintf (&ssh_port_str, "%d", pg->hosts[i].sshport); | 6032 | GNUNET_asprintf (&ssh_port_str, "%d", pg->hosts[i].sshport); |
6033 | proc = | 6033 | proc = |
6034 | GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh", "-P", ssh_port_str, | 6034 | GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", "-P", ssh_port_str, |
6035 | #if !DEBUG_TESTING | 6035 | #if !DEBUG_TESTING |
6036 | "-q", | 6036 | "-q", |
6037 | #endif | 6037 | #endif |
@@ -6039,7 +6039,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
6039 | } | 6039 | } |
6040 | else | 6040 | else |
6041 | proc = | 6041 | proc = |
6042 | GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh", arg, "mkdir -p", | 6042 | GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "ssh", "ssh", arg, "mkdir -p", |
6043 | tmpdir, NULL); | 6043 | tmpdir, NULL); |
6044 | GNUNET_assert (proc != NULL); | 6044 | GNUNET_assert (proc != NULL); |
6045 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 6045 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -6262,7 +6262,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
6262 | 6262 | ||
6263 | /* FIXME: Doesn't support ssh_port option! */ | 6263 | /* FIXME: Doesn't support ssh_port option! */ |
6264 | proc = | 6264 | proc = |
6265 | GNUNET_OS_start_process (NULL, NULL, "rsync", "rsync", "-r", | 6265 | GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "rsync", "rsync", "-r", |
6266 | newservicehome, arg, NULL); | 6266 | newservicehome, arg, NULL); |
6267 | #if DEBUG_TESTING | 6267 | #if DEBUG_TESTING |
6268 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 6268 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |