diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-09-18 12:38:14 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-09-18 12:38:14 +0000 |
commit | ff9736c1bd80381656a4afeb781aca56de4a80f5 (patch) | |
tree | c2552b94a42961b297360a52ae1cd91677c11cd7 | |
parent | daa36e96b19006dc9c608920fd4d1d864a1eb7e4 (diff) | |
download | gnunet-ff9736c1bd80381656a4afeb781aca56de4a80f5.tar.gz gnunet-ff9736c1bd80381656a4afeb781aca56de4a80f5.zip |
fixes
-rw-r--r-- | src/testbed/test_testbed_api_2peers_2controllers.c | 1 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_controllerlink.c | 1 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_testbed_run.c | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/testbed/test_testbed_api_2peers_2controllers.c b/src/testbed/test_testbed_api_2peers_2controllers.c index 97f425df2..57d9c1386 100644 --- a/src/testbed/test_testbed_api_2peers_2controllers.c +++ b/src/testbed/test_testbed_api_2peers_2controllers.c | |||
@@ -611,6 +611,7 @@ main (int argc, char **argv) | |||
611 | (void) usleep (300); | 611 | (void) usleep (300); |
612 | } | 612 | } |
613 | while (GNUNET_NO == ret); | 613 | while (GNUNET_NO == ret); |
614 | (void) GNUNET_OS_process_wait (auxp); | ||
614 | GNUNET_OS_process_destroy (auxp); | 615 | GNUNET_OS_process_destroy (auxp); |
615 | if (0 != code) | 616 | if (0 != code) |
616 | { | 617 | { |
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index 7a1690f7d..a82c78248 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c | |||
@@ -522,6 +522,7 @@ main (int argc, char **argv) | |||
522 | (void) usleep (300); | 522 | (void) usleep (300); |
523 | } | 523 | } |
524 | while (GNUNET_NO == ret); | 524 | while (GNUNET_NO == ret); |
525 | (void) GNUNET_OS_process_wait (auxp); | ||
525 | GNUNET_OS_process_destroy (auxp); | 526 | GNUNET_OS_process_destroy (auxp); |
526 | if (0 != code) | 527 | if (0 != code) |
527 | { | 528 | { |
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index 82734d7e9..dcb02dd7d 100644 --- a/src/testbed/test_testbed_api_testbed_run.c +++ b/src/testbed/test_testbed_api_testbed_run.c | |||
@@ -70,7 +70,7 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
70 | { | 70 | { |
71 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 71 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) |
72 | GNUNET_SCHEDULER_cancel (abort_task); | 72 | GNUNET_SCHEDULER_cancel (abort_task); |
73 | GNUNET_SCHEDULER_shutdown (); | 73 | GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */ |
74 | } | 74 | } |
75 | 75 | ||
76 | 76 | ||
@@ -86,7 +86,6 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
86 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 86 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
87 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 87 | abort_task = GNUNET_SCHEDULER_NO_TASK; |
88 | GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | 88 | GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); |
89 | GNUNET_SCHEDULER_shutdown (); /* Stop the scheduler */ | ||
90 | } | 89 | } |
91 | 90 | ||
92 | 91 | ||