diff options
Diffstat (limited to 'src/testing/testing_group.c')
-rw-r--r-- | src/testing/testing_group.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 29e87f6cf..d8e969461 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -2911,7 +2911,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg) | |||
2911 | GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", mytemp, arg, NULL); | 2911 | GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", mytemp, arg, NULL); |
2912 | GNUNET_assert (procarr[pg_iter] != NULL); | 2912 | GNUNET_assert (procarr[pg_iter] != NULL); |
2913 | ret = GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: schedule this, throttle! */ | 2913 | ret = GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: schedule this, throttle! */ |
2914 | GNUNET_OS_process_close (procarr[pg_iter]); | 2914 | GNUNET_OS_process_destroy (procarr[pg_iter]); |
2915 | if (ret != GNUNET_OK) | 2915 | if (ret != GNUNET_OK) |
2916 | { | 2916 | { |
2917 | /* FIXME: free contents of 'procarr' array */ | 2917 | /* FIXME: free contents of 'procarr' array */ |
@@ -2953,7 +2953,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg) | |||
2953 | } | 2953 | } |
2954 | else | 2954 | else |
2955 | { | 2955 | { |
2956 | GNUNET_OS_process_close (procarr[pg_iter]); | 2956 | GNUNET_OS_process_destroy (procarr[pg_iter]); |
2957 | procarr[pg_iter] = NULL; | 2957 | procarr[pg_iter] = NULL; |
2958 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "File %d copied\n", pg_iter); | 2958 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "File %d copied\n", pg_iter); |
2959 | } | 2959 | } |
@@ -3128,7 +3128,7 @@ create_and_copy_blacklist_files (struct GNUNET_TESTING_PeerGroup *pg, | |||
3128 | } | 3128 | } |
3129 | else | 3129 | else |
3130 | { | 3130 | { |
3131 | GNUNET_OS_process_close (procarr[pg_iter]); | 3131 | GNUNET_OS_process_destroy (procarr[pg_iter]); |
3132 | procarr[pg_iter] = NULL; | 3132 | procarr[pg_iter] = NULL; |
3133 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "File %d copied\n", pg_iter); | 3133 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "File %d copied\n", pg_iter); |
3134 | } | 3134 | } |
@@ -5672,7 +5672,7 @@ check_peers_started (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
5672 | 5672 | ||
5673 | } | 5673 | } |
5674 | } | 5674 | } |
5675 | GNUNET_OS_process_close (helper->proc); | 5675 | GNUNET_OS_process_destroy (helper->proc); |
5676 | } | 5676 | } |
5677 | 5677 | ||
5678 | static void | 5678 | static void |
@@ -5935,7 +5935,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
5935 | GNUNET_free (tmpdir); | 5935 | GNUNET_free (tmpdir); |
5936 | GNUNET_free (arg); | 5936 | GNUNET_free (arg); |
5937 | GNUNET_OS_process_wait (proc); | 5937 | GNUNET_OS_process_wait (proc); |
5938 | GNUNET_OS_process_close (proc); | 5938 | GNUNET_OS_process_destroy (proc); |
5939 | } | 5939 | } |
5940 | GNUNET_free (baseservicehome); | 5940 | GNUNET_free (baseservicehome); |
5941 | baseservicehome = NULL; | 5941 | baseservicehome = NULL; |
@@ -6161,7 +6161,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
6161 | GNUNET_assert (0); | 6161 | GNUNET_assert (0); |
6162 | } | 6162 | } |
6163 | GNUNET_OS_process_wait (proc); | 6163 | GNUNET_OS_process_wait (proc); |
6164 | GNUNET_OS_process_close (proc); | 6164 | GNUNET_OS_process_destroy (proc); |
6165 | } | 6165 | } |
6166 | /* Now all the configuration files and hostkeys are copied to the remote host. Call the hostkey callback for each peer! */ | 6166 | /* Now all the configuration files and hostkeys are copied to the remote host. Call the hostkey callback for each peer! */ |
6167 | GNUNET_SCHEDULER_add_now (&call_hostkey_callbacks, pg); | 6167 | GNUNET_SCHEDULER_add_now (&call_hostkey_callbacks, pg); |