diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-26 11:29:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-03-26 11:44:22 (GMT) |
| commit | 70c50aa23cc993a502cd3c87be8afb79d973b50e (patch) | |
| tree | 446bffd5b90c76145e30af3a841360273b9820c0 /Tests | |
| parent | 6b9172d759b5f00069e7d2c65f1c649d4a3b0a70 (diff) | |
| download | CMake-70c50aa23cc993a502cd3c87be8afb79d973b50e.zip CMake-70c50aa23cc993a502cd3c87be8afb79d973b50e.tar.gz CMake-70c50aa23cc993a502cd3c87be8afb79d973b50e.tar.bz2 | |
Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF"
Revert commit v3.8.0-rc1~305^2 (Remove CTestTestfile.cmake when BUILD_TESTING
is OFF, 2016-11-14) again. We reverted it once in commit v3.8.0-rc3~22^2
(Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF", 2017-03-06) but
it was accidentally restored by commit v3.11.0-rc1~387^2 (server: add
"ctestInfo" request to get test info, 2017-10-25), perhaps due to conflict
resolution during rebase.
We cannot remove `CTestTestfile.cmake` when testing is off because it breaks
projects that never enable testing but create their own `CTestTestfile.cmake`
manually instead. Revert the change again and add a test case.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CTest/CTestTestfile.cmake.in | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/CTest/NotOn-check.cmake | 8 | ||||
| -rw-r--r-- | Tests/RunCMake/CTest/NotOn.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/CTest/RunCMakeTest.cmake | 2 |
4 files changed, 14 insertions, 0 deletions
diff --git a/Tests/RunCMake/CTest/CTestTestfile.cmake.in b/Tests/RunCMake/CTest/CTestTestfile.cmake.in new file mode 100644 index 0000000..0763244 --- /dev/null +++ b/Tests/RunCMake/CTest/CTestTestfile.cmake.in @@ -0,0 +1 @@ +# Created manually diff --git a/Tests/RunCMake/CTest/NotOn-check.cmake b/Tests/RunCMake/CTest/NotOn-check.cmake new file mode 100644 index 0000000..b68218a --- /dev/null +++ b/Tests/RunCMake/CTest/NotOn-check.cmake @@ -0,0 +1,8 @@ +set(f "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake") +if(NOT EXISTS "${f}") + set(RunCMake_TEST_FAILED "File does not exist:\n ${f}") +endif() +file(READ ${f} content) +if(NOT "${content}" MATCHES "^# Created manually") + set(RunCMake_TEST_FAILED "File:\n ${f}\nhas unexpected content:\n ${content}") +endif() diff --git a/Tests/RunCMake/CTest/NotOn.cmake b/Tests/RunCMake/CTest/NotOn.cmake new file mode 100644 index 0000000..7fba019 --- /dev/null +++ b/Tests/RunCMake/CTest/NotOn.cmake @@ -0,0 +1,3 @@ +set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") +include(CTest) +configure_file(CTestTestfile.cmake.in CTestTestfile.cmake) diff --git a/Tests/RunCMake/CTest/RunCMakeTest.cmake b/Tests/RunCMake/CTest/RunCMakeTest.cmake index a6f6842..1392240 100644 --- a/Tests/RunCMake/CTest/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTest/RunCMakeTest.cmake @@ -3,3 +3,5 @@ include(RunCMake) set(RunCMake_TEST_OPTIONS -DNoProject=1) run_cmake(BeforeProject) unset(RunCMake_TEST_OPTIONS) + +run_cmake(NotOn) |