summaryrefslogtreecommitdiff
path: root/src/test/test_util.c
diff options
context:
space:
mode:
authorSteven Murdoch <Steven.Murdoch@cl.cam.ac.uk>2011-07-22 21:12:00 +0100
committerSteven Murdoch <Steven.Murdoch@cl.cam.ac.uk>2011-07-22 21:12:00 +0100
commit2d5059e08e16ef704c3021e3ccdc2923be02c7cb (patch)
treee4f1a4e8471242787d8a4676f2cb747de82e9ff6 /src/test/test_util.c
parent55a1cb53d6d1a8375afc12679b43901a977cf4b7 (diff)
downloadtor-2d5059e08e16ef704c3021e3ccdc2923be02c7cb.tar.gz
tor-2d5059e08e16ef704c3021e3ccdc2923be02c7cb.zip
Use PeekNamedPipe to avoid blocking ReadFile when there is nothing to read
Diffstat (limited to 'src/test/test_util.c')
-rw-r--r--src/test/test_util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 63c8ad8a93..c6dc98dc6b 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1431,11 +1431,11 @@ test_util_spawn_background_ok(void *ptr)
#ifdef MS_WINDOWS
// TODO: Under MSYS, BUILDDIR in orconfig.h needs to be tweaked
const char *argv[] = {BUILDDIR "/src/test/test-child.exe", "--test", NULL};
- const char *expected_out = "OUT\r\n--test\r\nDONE\r\n";
+ const char *expected_out = "OUT\r\n--test\r\nSLEEPING\r\nDONE\r\n";
const char *expected_err = "ERR\r\n";
#else
const char *argv[] = {BUILDDIR "/src/test/test-child", "--test", NULL};
- const char *expected_out = "OUT\n--test\nDONE\n";
+ const char *expected_out = "OUT\n--test\nSLEEPING\nDONE\n";
const char *expected_err = "ERR\n";
#endif