[GNUnet-SVN] r23880 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-09-18 14:38:14 +0200 (Tue, 18 Sep 2012)
New Revision: 23880

Modified:
   gnunet/src/testbed/test_testbed_api_2peers_2controllers.c
   gnunet/src/testbed/test_testbed_api_controllerlink.c
   gnunet/src/testbed/test_testbed_api_testbed_run.c
Log:
fixes

Modified: gnunet/src/testbed/test_testbed_api_2peers_2controllers.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_2peers_2controllers.c   2012-09-18 
11:52:40 UTC (rev 23879)
+++ gnunet/src/testbed/test_testbed_api_2peers_2controllers.c   2012-09-18 
12:38:14 UTC (rev 23880)
@@ -611,6 +611,7 @@
     (void) usleep (300);
   }
   while (GNUNET_NO == ret);
+  (void) GNUNET_OS_process_wait (auxp);
   GNUNET_OS_process_destroy (auxp);
   if (0 != code)
   {

Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c        2012-09-18 
11:52:40 UTC (rev 23879)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c        2012-09-18 
12:38:14 UTC (rev 23880)
@@ -522,6 +522,7 @@
     (void) usleep (300);
   }
   while (GNUNET_NO == ret);
+  (void) GNUNET_OS_process_wait (auxp);
   GNUNET_OS_process_destroy (auxp);
   if (0 != code)
   {

Modified: gnunet/src/testbed/test_testbed_api_testbed_run.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run.c   2012-09-18 11:52:40 UTC 
(rev 23879)
+++ gnunet/src/testbed/test_testbed_api_testbed_run.c   2012-09-18 12:38:14 UTC 
(rev 23880)
@@ -70,7 +70,7 @@
 {
   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 @@
   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 */
 }