diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-12-14 11:12:16 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-12-14 11:12:16 +0000 |
commit | ec15202872393424c4c43eac6fbada08d1f16dba (patch) | |
tree | c77f7d5bb33775eb88142e8a95445a2db53b2a60 /src/testing | |
parent | 4343a0ceaec1bc51c94039940c2415a8b681fb83 (diff) | |
download | gnunet-ec15202872393424c4c43eac6fbada08d1f16dba.tar.gz gnunet-ec15202872393424c4c43eac6fbada08d1f16dba.zip |
- use pipe control only on WINDOWS
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/testing.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c index d707cd597..2f4a75a18 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -36,6 +36,17 @@ | |||
36 | #define LOG(kind,...) \ | 36 | #define LOG(kind,...) \ |
37 | GNUNET_log_from (kind, "testing-api", __VA_ARGS__) | 37 | GNUNET_log_from (kind, "testing-api", __VA_ARGS__) |
38 | 38 | ||
39 | |||
40 | /** | ||
41 | * We need pipe control only on WINDOWS | ||
42 | */ | ||
43 | #if WINDOWS | ||
44 | #define PIPE_CONTROL GNUNET_YES | ||
45 | #else | ||
46 | #define PIPE_CONTROL GNUNET_NO | ||
47 | #endif | ||
48 | |||
49 | |||
39 | /** | 50 | /** |
40 | * Lowest port used for GNUnet testing. Should be high enough to not | 51 | * Lowest port used for GNUnet testing. Should be high enough to not |
41 | * conflict with other applications running on the hosts but be low | 52 | * conflict with other applications running on the hosts but be low |
@@ -984,7 +995,9 @@ GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer) | |||
984 | return GNUNET_SYSERR; | 995 | return GNUNET_SYSERR; |
985 | } | 996 | } |
986 | GNUNET_assert (NULL != peer->cfgfile); | 997 | GNUNET_assert (NULL != peer->cfgfile); |
987 | peer->main_process = GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, | 998 | peer->main_process = GNUNET_OS_start_process (PIPE_CONTROL, |
999 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | ||
1000 | NULL, NULL, | ||
988 | peer->main_binary, | 1001 | peer->main_binary, |
989 | peer->main_binary, | 1002 | peer->main_binary, |
990 | peer->args, | 1003 | peer->args, |