summaryrefslogtreecommitdiffstats
path: root/Tests/CMakeLists.txt
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-05-08 15:27:59 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-05-08 15:27:59 (GMT)
commit65a71a5db2836096c6d6b58749d3c7b118b6b200 (patch)
tree8d894dca2a3a3fa4976f6d9d8207bd5be9c3881d /Tests/CMakeLists.txt
parent3e206022abede98b60c9932e50034e23ba677d0f (diff)
parent54111286453894beb69ad18a9361edc2a50efc84 (diff)
downloadCMake-65a71a5db2836096c6d6b58749d3c7b118b6b200.zip
CMake-65a71a5db2836096c6d6b58749d3c7b118b6b200.tar.gz
CMake-65a71a5db2836096c6d6b58749d3c7b118b6b200.tar.bz2
Merge topic 'ctest-bad-generator'
54111286 ctest_build: Do not crash on bad generator name
Diffstat (limited to 'Tests/CMakeLists.txt')
-rw-r--r--Tests/CMakeLists.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9d642cc..fce7887 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2265,6 +2265,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
PASS_REGULAR_EXPRESSION "${CTestTestBadExe_REGEX}")
configure_file(
+ "${CMake_SOURCE_DIR}/Tests/CTestTestBadGenerator/test.cmake.in"
+ "${CMake_BINARY_DIR}/Tests/CTestTestBadGenerator/test.cmake"
+ @ONLY ESCAPE_QUOTES)
+ add_test(CTestTestBadGenerator ${CMAKE_CTEST_COMMAND}
+ -C "\${CTestTest_CONFIG}"
+ -S "${CMake_BINARY_DIR}/Tests/CTestTestBadGenerator/test.cmake" -V
+ --output-log "${CMake_BINARY_DIR}/Tests/CTestTestBadGenerator/testOutput.log"
+ )
+ set_property(TEST CTestTestBadGenerator PROPERTY
+ PASS_REGULAR_EXPRESSION "could not create generator named \"Bad Generator\"")
+
+ configure_file(
"${CMake_SOURCE_DIR}/Tests/CTestTestParallel/test.cmake.in"
"${CMake_BINARY_DIR}/Tests/CTestTestParallel/test.cmake"
@ONLY ESCAPE_QUOTES)