diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-22 12:09:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-22 12:09:52 (GMT) |
| commit | 3e14e594b41fe66d0366eadd5691c9a53e7e13c9 (patch) | |
| tree | 7af0d35e000e40b1e0e9679d0f5181da86ce8ead /Tests | |
| parent | 555ef1e235e62236870b27adb1b6c384313bd792 (diff) | |
| parent | 1d601c6cb978a3b6b6143fdf64e284fb3a098d1e (diff) | |
| download | CMake-3e14e594b41fe66d0366eadd5691c9a53e7e13c9.zip CMake-3e14e594b41fe66d0366eadd5691c9a53e7e13c9.tar.gz CMake-3e14e594b41fe66d0366eadd5691c9a53e7e13c9.tar.bz2 | |
Merge topic 'cmake-server-pipes'
1d601c6c server-mode: Introduce cmServerConnection
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CommandLine/E_server-pipe-result.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/E_server-pipe-stderr.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 1 | ||||
| -rw-r--r-- | Tests/Server/cmakelib.py | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/Tests/RunCMake/CommandLine/E_server-pipe-result.txt b/Tests/RunCMake/CommandLine/E_server-pipe-result.txt new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/Tests/RunCMake/CommandLine/E_server-pipe-result.txt @@ -0,0 +1 @@ +2 diff --git a/Tests/RunCMake/CommandLine/E_server-pipe-stderr.txt b/Tests/RunCMake/CommandLine/E_server-pipe-stderr.txt new file mode 100644 index 0000000..7193ba6 --- /dev/null +++ b/Tests/RunCMake/CommandLine/E_server-pipe-stderr.txt @@ -0,0 +1 @@ +^CMake Error: No pipe given after --pipe=$ diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index 9f76ad9..0c4f71c 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -13,6 +13,7 @@ run_cmake_command(E_capabilities-arg ${CMAKE_COMMAND} -E capabilities --extra-ar run_cmake_command(E_echo_append ${CMAKE_COMMAND} -E echo_append) run_cmake_command(E_rename-no-arg ${CMAKE_COMMAND} -E rename) run_cmake_command(E_server-arg ${CMAKE_COMMAND} -E server --extra-arg) +run_cmake_command(E_server-pipe ${CMAKE_COMMAND} -E server --pipe=) run_cmake_command(E_touch_nocreate-no-arg ${CMAKE_COMMAND} -E touch_nocreate) run_cmake_command(E_time ${CMAKE_COMMAND} -E time ${CMAKE_COMMAND} -E echo "hello world") diff --git a/Tests/Server/cmakelib.py b/Tests/Server/cmakelib.py index e89b1f0..0f98078 100644 --- a/Tests/Server/cmakelib.py +++ b/Tests/Server/cmakelib.py @@ -79,7 +79,7 @@ def writePayload(cmakeCommand, obj): writeRawData(cmakeCommand, json.dumps(obj)) def initProc(cmakeCommand): - cmakeCommand = subprocess.Popen([cmakeCommand, "-E", "server", "--experimental"], + cmakeCommand = subprocess.Popen([cmakeCommand, "-E", "server", "--experimental", "--debug"], stdin=subprocess.PIPE, stdout=subprocess.PIPE) |