summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/CommandLine
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-19 13:36:34 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-09-19 13:36:34 (GMT)
commit5c87b92b1b7888ee032e3c2a75f35f1f94f4dfa5 (patch)
treeab19ef186570cb3637eab19d19bef17207a1b748 /Tests/RunCMake/CommandLine
parent419ad0510193eb2b2e227095a4dd167cd9b3df80 (diff)
parent7263667c24cecf4bb155fc0cbf687dee8b57f5f7 (diff)
downloadCMake-5c87b92b1b7888ee032e3c2a75f35f1f94f4dfa5.zip
CMake-5c87b92b1b7888ee032e3c2a75f35f1f94f4dfa5.tar.gz
CMake-5c87b92b1b7888ee032e3c2a75f35f1f94f4dfa5.tar.bz2
Merge topic 'cmake-server-basic'
7263667c Help: Add notes for topic 'cmake-server-basic' 5adde4e7 cmake-server: Add documentation b63c1f6c cmake-server: Add unit test d341d077 cmake-server: Implement ServerProtocol 1.0 b13d3e0d cmake-server: Bare-bones server implementation cd049f01 cmake-server: Report server mode availablitily in Capabilities
Diffstat (limited to 'Tests/RunCMake/CommandLine')
-rw-r--r--Tests/RunCMake/CommandLine/E_server-arg-result.txt1
-rw-r--r--Tests/RunCMake/CommandLine/E_server-arg-stderr.txt1
-rw-r--r--Tests/RunCMake/CommandLine/RunCMakeTest.cmake1
3 files changed, 3 insertions, 0 deletions
diff --git a/Tests/RunCMake/CommandLine/E_server-arg-result.txt b/Tests/RunCMake/CommandLine/E_server-arg-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_server-arg-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CommandLine/E_server-arg-stderr.txt b/Tests/RunCMake/CommandLine/E_server-arg-stderr.txt
new file mode 100644
index 0000000..7877c01
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/E_server-arg-stderr.txt
@@ -0,0 +1 @@
+^CMake Error: Too many arguments to start server mode$
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 6ae47a8..9f76ad9 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -12,6 +12,7 @@ run_cmake_command(E_capabilities ${CMAKE_COMMAND} -E capabilities)
run_cmake_command(E_capabilities-arg ${CMAKE_COMMAND} -E capabilities --extra-arg)
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_touch_nocreate-no-arg ${CMAKE_COMMAND} -E touch_nocreate)
run_cmake_command(E_time ${CMAKE_COMMAND} -E time ${CMAKE_COMMAND} -E echo "hello world")