From ff9736c1bd80381656a4afeb781aca56de4a80f5 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Tue, 18 Sep 2012 12:38:14 +0000 Subject: fixes --- src/testbed/test_testbed_api_2peers_2controllers.c | 1 + src/testbed/test_testbed_api_controllerlink.c | 1 + src/testbed/test_testbed_api_testbed_run.c | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/testbed') 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) (void) usleep (300); } while (GNUNET_NO == ret); + (void) GNUNET_OS_process_wait (auxp); GNUNET_OS_process_destroy (auxp); if (0 != code) { 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) (void) usleep (300); } while (GNUNET_NO == ret); + (void) GNUNET_OS_process_wait (auxp); GNUNET_OS_process_destroy (auxp); if (0 != code) { 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) { if (GNUNET_SCHEDULER_NO_TASK != abort_task) GNUNET_SCHEDULER_cancel (abort_task); - GNUNET_SCHEDULER_shutdown (); + GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */ } @@ -86,7 +86,6 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); abort_task = GNUNET_SCHEDULER_NO_TASK; GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); - GNUNET_SCHEDULER_shutdown (); /* Stop the scheduler */ } -- cgit v1.2.3