diff options
author | Brad King <brad.king@kitware.com> | 2018-11-19 14:51:57 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-19 14:52:07 (GMT) |
commit | 95a735116f51285f78acb04d1bdc7863122fd94a (patch) | |
tree | 6da8840ecdca83c733a006e61ec05a40cd8ebd9b /Source/CTest | |
parent | 61e3ceda21800949f1a4411f27efefcda789bd4d (diff) | |
parent | 86e8315482fd8f0bba85af6f4f8363ead6a0818d (diff) | |
download | CMake-95a735116f51285f78acb04d1bdc7863122fd94a.zip CMake-95a735116f51285f78acb04d1bdc7863122fd94a.tar.gz CMake-95a735116f51285f78acb04d1bdc7863122fd94a.tar.bz2 |
Merge topic 'ctest-stdin'
86e8315482 CTest: Restore inheritance of stdin by test processes
bdec3bd896 Tests: Teach RunCMake infrastructure to optionally provide stdin
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2618
Diffstat (limited to 'Source/CTest')
-rw-r--r-- | Source/CTest/cmProcess.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx index 39cea87..c4cf046 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -127,7 +127,8 @@ bool cmProcess::StartProcess(uv_loop_t& loop, std::vector<size_t>* affinity) uv_pipe_open(pipe_writer, fds[1]); uv_stdio_container_t stdio[3]; - stdio[0].flags = UV_IGNORE; + stdio[0].flags = UV_INHERIT_FD; + stdio[0].data.fd = 0; stdio[1].flags = UV_INHERIT_STREAM; stdio[1].data.stream = pipe_writer; stdio[2] = stdio[1]; |