-typo

[oweals/gnunet.git] / src / util / test_os_start_process.c

diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index 3bcd636d3a3351d6e9e74b5974861f6d6fc9a630..e24e09500cd6baf7b3bc133625624e8748422f6f 100644 (file)
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -33,21 +33,26 @@
 #include "gnunet_scheduler_lib.h"
 #include "disk.h"
 
-#define VERBOSE GNUNET_NO
 
-static char *test_phrase = "HELLO WORLD";
+static const char *test_phrase = "HELLO WORLD";
+
 static int ok;
 
 static struct GNUNET_OS_Process *proc;
 
-/* Pipe to write to started processes stdin (on write end) */
+/**
+ * Pipe to write to started processes stdin (on write end) 
+ */
 static struct GNUNET_DISK_PipeHandle *hello_pipe_stdin;
 
-/* Pipe to read from started processes stdout (on read end) */
+/**
+ * Pipe to read from started processes stdout (on read end) 
+ */
 static struct GNUNET_DISK_PipeHandle *hello_pipe_stdout;
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
+
 static void
 end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -56,12 +61,13 @@ end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
   }
   GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc));
-  GNUNET_OS_process_close (proc);
+  GNUNET_OS_process_destroy (proc);
   proc = NULL;
   GNUNET_DISK_pipe_close (hello_pipe_stdout);
   GNUNET_DISK_pipe_close (hello_pipe_stdin);
 }
 
+
 static void
 read_call (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -73,9 +79,7 @@ read_call (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   bytes = GNUNET_DISK_file_read (stdout_read_handle, &buf, sizeof (buf));
 
-#if VERBOSE
-  FPRINTF (stderr, "bytes is %d\n", bytes);
-#endif
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "bytes is %d\n", bytes);
 
   if (bytes < 1)
   {
@@ -87,10 +91,8 @@ read_call (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
 
   ok = strncmp (&buf[0], test_phrase, strlen (test_phrase));
-#if VERBOSE
-  FPRINTF (stderr, "read %s\n", &buf[0]);
-#endif
-  if (ok == 0)
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "read %s\n", &buf[0]);
+  if (0 == ok)
   {
     GNUNET_SCHEDULER_cancel (die_task);
     GNUNET_SCHEDULER_add_now (&end_task, NULL);
@@ -111,7 +113,11 @@ run_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   const struct GNUNET_DISK_FileHandle *stdout_read_handle;
   const struct GNUNET_DISK_FileHandle *wh;
 
+#if !WINDOWS
   GNUNET_asprintf (&fn, "cat");
+#else
+  GNUNET_asprintf (&fn, "w32cat");
+#endif
 
   hello_pipe_stdin = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO);
   hello_pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
@@ -125,7 +131,7 @@ run_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
 
   proc =
-      GNUNET_OS_start_process (GNUNET_NO, hello_pipe_stdin, hello_pipe_stdout, fn,
+      GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ERR, hello_pipe_stdin, hello_pipe_stdout, fn,
                                "test_gnunet_echo_hello", "-", NULL);
   GNUNET_free (fn);
 
@@ -181,6 +187,12 @@ check_run ()
 static int
 check_kill ()
 {
+  char *fn;
+#if !WINDOWS
+  GNUNET_asprintf (&fn, "cat");
+#else
+  GNUNET_asprintf (&fn, "w32cat");
+#endif
   hello_pipe_stdin = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO);
   hello_pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
   if ((hello_pipe_stdout == NULL) || (hello_pipe_stdin == NULL))
@@ -188,15 +200,13 @@ check_kill ()
     return 1;
   }
   proc =
-    GNUNET_OS_start_process (GNUNET_YES, hello_pipe_stdin, hello_pipe_stdout, "cat",
+    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR, hello_pipe_stdin, hello_pipe_stdout, fn,
                             "gnunet-service-resolver", "-", NULL); 
-  sleep (1); /* give process time to start and open pipe */
+  sleep (1); /* give process time to start, so we actually use the pipe-kill mechanism! */
   if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
-  {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-  }
   GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc));
-  GNUNET_OS_process_close (proc);
+  GNUNET_OS_process_destroy (proc);
   proc = NULL;
   GNUNET_DISK_pipe_close (hello_pipe_stdout);
   GNUNET_DISK_pipe_close (hello_pipe_stdin);
@@ -210,6 +220,12 @@ check_kill ()
 static int
 check_instant_kill ()
 {
+  char *fn;
+#if !WINDOWS
+  GNUNET_asprintf (&fn, "cat");
+#else
+  GNUNET_asprintf (&fn, "w32cat");
+#endif
   hello_pipe_stdin = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO);
   hello_pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
   if ((hello_pipe_stdout == NULL) || (hello_pipe_stdin == NULL))
@@ -217,14 +233,14 @@ check_instant_kill ()
     return 1;
   }
   proc =
-    GNUNET_OS_start_process (GNUNET_YES, hello_pipe_stdin, hello_pipe_stdout, "cat",
+    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR, hello_pipe_stdin, hello_pipe_stdout, fn,
                             "gnunet-service-resolver", "-", NULL); 
   if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
   }
   GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc));
-  GNUNET_OS_process_close (proc);
+  GNUNET_OS_process_destroy (proc);
   proc = NULL;
   GNUNET_DISK_pipe_close (hello_pipe_stdout);
   GNUNET_DISK_pipe_close (hello_pipe_stdin);
@@ -238,16 +254,13 @@ main (int argc, char *argv[])
   int ret;
 
   GNUNET_log_setup ("test-os-start-process",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
   ret = 0;
   ret |= check_run ();
   ret |= check_kill ();
   ret |= check_instant_kill ();
-
   return ret;
 }
+
+/* end of test_os_start_process.c */