diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-03-30 14:55:27 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-03-30 14:55:27 +0000 |
commit | a891ecfd9a6d9ed04f173cb790d1a18c4fd08d21 (patch) | |
tree | f170ce64b9356349bc3dcb95cd9690ef30e24322 /src/testing/testing.c | |
parent | 3340f9f98d02fd3f1b68ddd6e465516aae3b67c3 (diff) | |
download | gnunet-a891ecfd9a6d9ed04f173cb790d1a18c4fd08d21.tar.gz gnunet-a891ecfd9a6d9ed04f173cb790d1a18c4fd08d21.zip |
write control_host information to testing configs (for remote starting), hasn't been sufficiently tested
Diffstat (limited to 'src/testing/testing.c')
-rw-r--r-- | src/testing/testing.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c index a1bbb4f70..6c670e8d4 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include "gnunet_testing_lib.h" | 40 | #include "gnunet_testing_lib.h" |
41 | #include "gnunet_transport_service.h" | 41 | #include "gnunet_transport_service.h" |
42 | 42 | ||
43 | #define DEBUG_TESTING GNUNET_NO | 43 | #define DEBUG_TESTING GNUNET_YES |
44 | 44 | ||
45 | /** | 45 | /** |
46 | * How long do we wait after starting gnunet-service-arm | 46 | * How long do we wait after starting gnunet-service-arm |
@@ -168,6 +168,13 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
168 | /* start GNUnet on remote host */ | 168 | /* start GNUnet on remote host */ |
169 | if (NULL == d->hostname) | 169 | if (NULL == d->hostname) |
170 | { | 170 | { |
171 | #if DEBUG_TESTING | ||
172 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
173 | "Starting `%s', with command `%s %s %s %s %s %s'.\n", | ||
174 | "gnunet-arm", "gnunet-arm", "-c", d->cfgfile, | ||
175 | "-L", "DEBUG", | ||
176 | "-s"); | ||
177 | #endif | ||
171 | d->pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm", | 178 | d->pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm", |
172 | "gnunet-arm", | 179 | "gnunet-arm", |
173 | "-c", d->cfgfile, | 180 | "-c", d->cfgfile, |
@@ -182,6 +189,13 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
182 | GNUNET_asprintf (&dst, "%s@%s", d->username, d->hostname); | 189 | GNUNET_asprintf (&dst, "%s@%s", d->username, d->hostname); |
183 | else | 190 | else |
184 | dst = GNUNET_strdup (d->hostname); | 191 | dst = GNUNET_strdup (d->hostname); |
192 | |||
193 | #if DEBUG_TESTING | ||
194 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
195 | "Starting `%s', with command `%s %s %s %s %s %s %s %s'.\n", | ||
196 | "gnunet-arm", "ssh", dst, "gnunet-arm", "-c", d->cfgfile, | ||
197 | "-L", "DEBUG", "-s"); | ||
198 | #endif | ||
185 | d->pid = GNUNET_OS_start_process (NULL, NULL, "ssh", | 199 | d->pid = GNUNET_OS_start_process (NULL, NULL, "ssh", |
186 | "ssh", | 200 | "ssh", |
187 | dst, | 201 | dst, |
@@ -534,7 +548,7 @@ GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d, | |||
534 | #if DEBUG_TESTING | 548 | #if DEBUG_TESTING |
535 | "-L", "DEBUG", | 549 | "-L", "DEBUG", |
536 | #endif | 550 | #endif |
537 | "-c", d->cfgfile, "-e", "-d", NULL); | 551 | "-c", d->cfgfile, "-e", NULL); |
538 | /* Use -e to end arm, and -d to remove temp files */ | 552 | /* Use -e to end arm, and -d to remove temp files */ |
539 | 553 | ||
540 | GNUNET_free (arg); | 554 | GNUNET_free (arg); |