diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-07-26 12:54:23 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-07-26 12:54:23 +0000 |
commit | c510f4429e864b0215885e8cfcde56d464750369 (patch) | |
tree | 41208ebc6257a3dc2bc8fff90edd09f39dedeefd /src | |
parent | 272d0d7b657859b382b82078e5fab3b74d39c01f (diff) | |
download | gnunet-c510f4429e864b0215885e8cfcde56d464750369.tar.gz gnunet-c510f4429e864b0215885e8cfcde56d464750369.zip |
remote host testing
Diffstat (limited to 'src')
-rw-r--r-- | src/testing/testing_group.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 6ce953b06..735ac2274 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -6128,8 +6128,6 @@ GNUNET_TESTING_daemons_start(const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
6128 | hostname = pg->hosts[off % hostcnt].hostname; | 6128 | hostname = pg->hosts[off % hostcnt].hostname; |
6129 | username = pg->hosts[off % hostcnt].username; | 6129 | username = pg->hosts[off % hostcnt].username; |
6130 | sshport = pg->hosts[off % hostcnt].sshport; | 6130 | sshport = pg->hosts[off % hostcnt].sshport; |
6131 | pcfg = make_config (cfg, off, &pg->hosts[off % hostcnt].minport, | ||
6132 | &upnum, hostname, &fdnum); | ||
6133 | } | 6131 | } |
6134 | else | 6132 | else |
6135 | { | 6133 | { |
@@ -6144,9 +6142,9 @@ GNUNET_TESTING_daemons_start(const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
6144 | &baseservicehome)) | 6142 | &baseservicehome)) |
6145 | { | 6143 | { |
6146 | if (hostname != NULL) | 6144 | if (hostname != NULL) |
6147 | GNUNET_asprintf (&newservicehome, "%s/%s/%d/", baseservicehome, hostname, off); | 6145 | GNUNET_asprintf (&newservicehome, "%s/%s/", baseservicehome, hostname); |
6148 | else | 6146 | else |
6149 | GNUNET_asprintf (&newservicehome, "%s/%d/", baseservicehome, off); | 6147 | GNUNET_asprintf (&newservicehome, "%s/", baseservicehome); |
6150 | GNUNET_free (baseservicehome); | 6148 | GNUNET_free (baseservicehome); |
6151 | baseservicehome = NULL; | 6149 | baseservicehome = NULL; |
6152 | } | 6150 | } |
@@ -6155,26 +6153,24 @@ GNUNET_TESTING_daemons_start(const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
6155 | tmpdir = getenv ("TMPDIR"); | 6153 | tmpdir = getenv ("TMPDIR"); |
6156 | tmpdir = tmpdir ? tmpdir : "/tmp"; | 6154 | tmpdir = tmpdir ? tmpdir : "/tmp"; |
6157 | if (hostname != NULL) | 6155 | if (hostname != NULL) |
6158 | GNUNET_asprintf (&newservicehome, "%s/%s/%s/%d/", tmpdir, hostname, | 6156 | GNUNET_asprintf (&newservicehome, "%s/%s/%s/", tmpdir, hostname, |
6159 | "gnunet-testing-test-test", off); | 6157 | "gnunet-testing-test-test"); |
6160 | else | 6158 | else |
6161 | GNUNET_asprintf (&newservicehome, "%s/%s/%d/", tmpdir, | 6159 | GNUNET_asprintf (&newservicehome, "%s/%s/", tmpdir, |
6162 | "gnunet-testing-test-test", off); | 6160 | "gnunet-testing-test-test", off); |
6163 | } | 6161 | } |
6164 | 6162 | ||
6165 | if (NULL != username) | 6163 | if (NULL != username) |
6166 | GNUNET_asprintf (&arg, | 6164 | GNUNET_asprintf (&arg, |
6167 | "%s@%s:%s/%s", | 6165 | "%s@%s:%s", |
6168 | username, | 6166 | username, |
6169 | pg->hosts[off].hostname, | 6167 | pg->hosts[off].hostname, |
6170 | newservicehome, | 6168 | newservicehome); |
6171 | pg->hosts[off].hostname); | ||
6172 | else | 6169 | else |
6173 | GNUNET_asprintf (&arg, | 6170 | GNUNET_asprintf (&arg, |
6174 | "%s:%s/%s", | 6171 | "%s:%s", |
6175 | pg->hosts[off].hostname, | 6172 | pg->hosts[off].hostname, |
6176 | newservicehome, | 6173 | newservicehome); |
6177 | pg->hosts[off].hostname); | ||
6178 | 6174 | ||
6179 | /* FIXME: Doesn't support ssh_port option! */ | 6175 | /* FIXME: Doesn't support ssh_port option! */ |
6180 | proc = GNUNET_OS_start_process (NULL, NULL, | 6176 | proc = GNUNET_OS_start_process (NULL, NULL, |