gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r26127 - gnunet/src/util


From: gnunet
Subject: [GNUnet-SVN] r26127 - gnunet/src/util
Date: Fri, 15 Feb 2013 10:47:43 +0100

Author: LRN
Date: 2013-02-15 10:47:43 +0100 (Fri, 15 Feb 2013)
New Revision: 26127

Modified:
   gnunet/src/util/test_os_start_process.c
Log:
Another highly temporary fix to make os_start_process pass

Modified: gnunet/src/util/test_os_start_process.c
===================================================================
--- gnunet/src/util/test_os_start_process.c     2013-02-15 09:32:43 UTC (rev 
26126)
+++ gnunet/src/util/test_os_start_process.c     2013-02-15 09:47:43 UTC (rev 
26127)
@@ -188,20 +188,16 @@
 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))
   {
-    GNUNET_free (fn);
     return 1;
   }
+  fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
   proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR, 
hello_pipe_stdin, hello_pipe_stdout, "gnunet-service-resolver",
+    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, so we actually use the pipe-kill 
mechanism! */
   GNUNET_free (fn);
@@ -223,20 +219,16 @@
 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))
   {
-    GNUNET_free (fn);
     return 1;
   }
+  fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
   proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR, 
hello_pipe_stdin, hello_pipe_stdout, "gnunet-service-resolver",
+    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))
   {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]