[GNUnet-SVN] r21964 - gnunet/src/testing

[gnunet]

Author: dold
Date: 2012-06-13 14:41:21 +0200 (Wed, 13 Jun 2012)
New Revision: 21964

Modified:
   gnunet/src/testing/gnunet-testing-run-service.c
Log:
changed how gnunet-testing-run-service communicates over stdin/stdout


Modified: gnunet/src/testing/gnunet-testing-run-service.c
===================================================================
--- gnunet/src/testing/gnunet-testing-run-service.c     2012-06-13 12:39:48 UTC 
(rev 21963)
+++ gnunet/src/testing/gnunet-testing-run-service.c     2012-06-13 12:41:21 UTC 
(rev 21964)
@@ -83,14 +83,14 @@
   if (GNUNET_SCHEDULER_REASON_READ_READY & tc->reason)
   {
     c = getchar ();
-    if (EOF == c)
+    if (EOF == c || 'q' == c)
     {
       tid = GNUNET_SCHEDULER_NO_TASK;
       cleanup ();
     }
     else
     {
-      if (c == 'r')
+      if ('r' == c)
       {
         GNUNET_TESTING_peer_stop(my_peer); 
         GNUNET_TESTING_peer_start(my_peer); 
@@ -128,7 +128,7 @@
     return;
   }
 
-  printf("%s\n", tmpfilename);
+  printf("started\n%s\n", tmpfilename);
   fflush(stdout);
 
   GNUNET_break(NULL != GNUNET_SIGNAL_handler_install(SIGTERM, &cleanup));
@@ -179,8 +179,14 @@
 
   ret =  GNUNET_TESTING_service_run_restartable ("gnunet_service_test", 
argv[1],
                                                  NULL, &testing_main, NULL);
-
-  printf ("bye\n");
-
+  if (ret)
+  {
+    printf ("error\n");
+  }
+  else 
+  {
+    printf ("bye\n");
+  }
   return ret;
 }
+