summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-05-15 15:22:36 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-05-15 15:22:36 (GMT)
commit2e4ea0c055e01e10c8f459398f943b1b62c5c7bb (patch)
tree2f903a24d297b2d9008c653157a24eab5490347c /Tests/RunCMake
parent912dff6253891dacb6a0196456adab26516a0949 (diff)
parentce167b546d078d9f699248688ff5f16c7ecf15c7 (diff)
downloadCMake-2e4ea0c055e01e10c8f459398f943b1b62c5c7bb.zip
CMake-2e4ea0c055e01e10c8f459398f943b1b62c5c7bb.tar.gz
CMake-2e4ea0c055e01e10c8f459398f943b1b62c5c7bb.tar.bz2
Merge topic 'refactor-cmLocalGenerator'
ce167b54 cmMakefile: Handle CMP0014 before configuring the generator. 7baef756 cmLocalGenerator: Assert that there is a parent. 63255342 cmMakefile: Remove redundant variable set. 894961af cmMakefile: Use the state to determine the parent directory. 115e9199 Use new top-level check abstraction. c5059c90 cmLocalGenerator: Add abstraction to check if top-level. b17686d2 cmGlobalGenerator: Move some flags from cmLocalGenerator. ed41a8e7 cmLocalGenerator: Port loops to cmState::Snapshot. 48a9e91b cmState: Add an accessor for Parent snapshot and a validity check. e7f7c2e2 cmLocalGenerator: Convert two recursive methods to loops. c5cb3a73 cmLocalGenerator: Get project directories from the cmState. 76b59831 cmLocalGenerator: Initialize state before creating cmMakefile. 34c9ee2e cmLocalGenerator: Require a global generator in the constructor. 3837c483 Tests: Add case for 'ctest' run with bad CTestTestfile b317b38d cmGlobalBorlandMakefileGenerator: Do not inherit from NMake generator 94867698 Don't use a cmLocalGenerator instance to call static methods. ...
Diffstat (limited to 'Tests/RunCMake')
-rw-r--r--Tests/RunCMake/CTestCommandLine/BadCTestTestfile-stderr.txt4
-rw-r--r--Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake13
2 files changed, 17 insertions, 0 deletions
diff --git a/Tests/RunCMake/CTestCommandLine/BadCTestTestfile-stderr.txt b/Tests/RunCMake/CTestCommandLine/BadCTestTestfile-stderr.txt
new file mode 100644
index 0000000..d95bb33
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/BadCTestTestfile-stderr.txt
@@ -0,0 +1,4 @@
+^CMake Error at CTestTestfile.cmake:[0-9]+ \(subdirs\):
+ subdirs called with incorrect number of arguments
++
+No tests were found!!!$
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index 22a8d20..0cb11ac 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -26,3 +26,16 @@ function(run_repeat_until_fail_tests)
)
endfunction()
run_repeat_until_fail_tests()
+
+function(run_BadCTestTestfile)
+ set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/BadCTestTestfile)
+ set(RunCMake_TEST_NO_CLEAN 1)
+ file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+ file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+ file(WRITE "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake" "
+subdirs()
+")
+
+ run_cmake_command(BadCTestTestfile ${CMAKE_CTEST_COMMAND})
+endfunction()
+run_BadCTestTestfile()