[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25481 - in gnunet/src: testbed testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25481 - in gnunet/src: testbed testing |
Date: |
Fri, 14 Dec 2012 12:12:17 +0100 |
Author: harsha
Date: 2012-12-14 12:12:16 +0100 (Fri, 14 Dec 2012)
New Revision: 25481
Modified:
gnunet/src/testbed/gnunet-helper-testbed.c
gnunet/src/testing/testing.c
Log:
- use pipe control only on WINDOWS
Modified: gnunet/src/testbed/gnunet-helper-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-helper-testbed.c 2012-12-14 10:56:21 UTC (rev
25480)
+++ gnunet/src/testbed/gnunet-helper-testbed.c 2012-12-14 11:12:16 UTC (rev
25481)
@@ -52,6 +52,16 @@
/**
+ * We need pipe control only on WINDOWS
+ */
+#if WINDOWS
+#define PIPE_CONTROL GNUNET_YES
+#else
+#define PIPE_CONTROL GNUNET_NO
+#endif
+
+
+/**
* Context for a single write on a chunk of memory
*/
struct WriteContext
@@ -321,7 +331,7 @@
LOG_DEBUG ("Staring testbed with config: %s\n", config);
binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-testbed");
testbed =
- GNUNET_OS_start_process (GNUNET_YES,
+ GNUNET_OS_start_process (PIPE_CONTROL,
GNUNET_OS_INHERIT_STD_ERR /*verbose? */ , NULL,
NULL,
binary,
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2012-12-14 10:56:21 UTC (rev 25480)
+++ gnunet/src/testing/testing.c 2012-12-14 11:12:16 UTC (rev 25481)
@@ -36,7 +36,18 @@
#define LOG(kind,...) \
GNUNET_log_from (kind, "testing-api", __VA_ARGS__)
+
/**
+ * We need pipe control only on WINDOWS
+ */
+#if WINDOWS
+#define PIPE_CONTROL GNUNET_YES
+#else
+#define PIPE_CONTROL GNUNET_NO
+#endif
+
+
+/**
* Lowest port used for GNUnet testing. Should be high enough to not
* conflict with other applications running on the hosts but be low
* enough to not conflict with client-ports (typically starting around
@@ -984,7 +995,9 @@
return GNUNET_SYSERR;
}
GNUNET_assert (NULL != peer->cfgfile);
- peer->main_process = GNUNET_OS_start_process (GNUNET_YES,
GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL,
+ peer->main_process = GNUNET_OS_start_process (PIPE_CONTROL,
+
GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ NULL, NULL,
peer->main_binary,
peer->main_binary,
peer->args,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25481 - in gnunet/src: testbed testing,
gnunet <=