diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-03-15 10:16:38 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-03-15 10:16:38 +0000 |
commit | ba5e41452e8d1fa1283236a7aac9fb85ad3bcd0a (patch) | |
tree | beec835b161628aac35a0d0363852e4eeb489a50 /src/testing/testing_group.c | |
parent | 1e4b14df7222f249112399812bd9d2df15ab5139 (diff) | |
download | gnunet-ba5e41452e8d1fa1283236a7aac9fb85ad3bcd0a.tar.gz gnunet-ba5e41452e8d1fa1283236a7aac9fb85ad3bcd0a.zip |
reduce verbosity
Diffstat (limited to 'src/testing/testing_group.c')
-rw-r--r-- | src/testing/testing_group.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 8fb21d01a..494a3f566 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -5597,6 +5597,7 @@ check_peers_started (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
5597 | unsigned int i; | 5597 | unsigned int i; |
5598 | GNUNET_TESTING_NotifyDaemonRunning cb; | 5598 | GNUNET_TESTING_NotifyDaemonRunning cb; |
5599 | 5599 | ||
5600 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Checking whether peer startup process finished!\n"); | ||
5600 | if (GNUNET_NO == GNUNET_OS_process_status (helper->proc, &type, &code)) /* Still running, wait some more! */ | 5601 | if (GNUNET_NO == GNUNET_OS_process_status (helper->proc, &type, &code)) /* Still running, wait some more! */ |
5601 | { | 5602 | { |
5602 | GNUNET_SCHEDULER_add_delayed(GNUNET_CONSTANTS_EXEC_WAIT, &check_peers_started, helper); | 5603 | GNUNET_SCHEDULER_add_delayed(GNUNET_CONSTANTS_EXEC_WAIT, &check_peers_started, helper); |
@@ -6000,7 +6001,6 @@ GNUNET_TESTING_daemons_start(const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
6000 | #else | 6001 | #else |
6001 | if ((pg->hostkey_data != NULL) && (hostcnt > 0)) | 6002 | if ((pg->hostkey_data != NULL) && (hostcnt > 0)) |
6002 | { | 6003 | { |
6003 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Have hostkey data and running on remote hosts!\n"); | ||
6004 | pg->peers[off].daemon = GNUNET_TESTING_daemon_start (pcfg, | 6004 | pg->peers[off].daemon = GNUNET_TESTING_daemon_start (pcfg, |
6005 | timeout, | 6005 | timeout, |
6006 | GNUNET_YES, | 6006 | GNUNET_YES, |
@@ -6036,22 +6036,17 @@ GNUNET_TESTING_daemons_start(const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
6036 | { | 6036 | { |
6037 | for (off = 0; off < hostcnt; off++) | 6037 | for (off = 0; off < hostcnt; off++) |
6038 | { | 6038 | { |
6039 | GNUNET_asprintf(&newservicehome, "%s/%s/*", baseservicehome, pg->hosts[off].hostname); | 6039 | GNUNET_asprintf(&newservicehome, "%s/%s/", baseservicehome, pg->hosts[off].hostname); |
6040 | 6040 | ||
6041 | if (NULL != username) | 6041 | if (NULL != username) |
6042 | GNUNET_asprintf (&arg, "%s@%s:%s", username, pg->hosts[off].hostname, baseservicehome); | 6042 | GNUNET_asprintf (&arg, "%s@%s:%s/%s", username, pg->hosts[off].hostname, baseservicehome, pg->hosts[off].hostname); |
6043 | else | 6043 | else |
6044 | GNUNET_asprintf (&arg, "%s:%s", pg->hosts[off].hostname, baseservicehome); | 6044 | GNUNET_asprintf (&arg, "%s:%s/%s", pg->hosts[off].hostname, baseservicehome, pg->hosts[off].hostname); |
6045 | 6045 | ||
6046 | /* FIXME: Doesn't support ssh_port option! */ | 6046 | /* FIXME: Doesn't support ssh_port option! */ |
6047 | proc = GNUNET_OS_start_process (NULL, NULL, "scp", "scp", "-r", | 6047 | proc = GNUNET_OS_start_process (NULL, NULL, "rsync", "rsync", "-r", newservicehome, arg, NULL); |
6048 | #if !DEBUG_TESTING | ||
6049 | "-q", | ||
6050 | #endif | ||
6051 | newservicehome, arg, NULL); | ||
6052 | |||
6053 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "copying directory with command scp -r %s %s\n", newservicehome, arg); | ||
6054 | 6048 | ||
6049 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "copying directory with command rsync -r %s %s\n", newservicehome, arg); | ||
6055 | 6050 | ||
6056 | GNUNET_free (arg); | 6051 | GNUNET_free (arg); |
6057 | if (NULL == proc) | 6052 | if (NULL == proc) |