diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-22 17:59:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-22 17:59:14 (GMT) |
| commit | 7bffd71c3b79dabb90c1c90f9527f3533411d7bb (patch) | |
| tree | 306083946202904d92f94e634fe1f1b09c7e521e /Tests | |
| parent | 44ca3d922cc1da390eaea3673a025a9b96556afc (diff) | |
| download | CMake-7bffd71c3b79dabb90c1c90f9527f3533411d7bb.zip CMake-7bffd71c3b79dabb90c1c90f9527f3533411d7bb.tar.gz CMake-7bffd71c3b79dabb90c1c90f9527f3533411d7bb.tar.bz2 | |
Tests: Adopt wizard test in RunCMake.CommandLine
Avoid a whole separate test for one removed command-line option.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/Wizard-result.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/Wizard-stderr.txt | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 89babe4..b389a13 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -3441,10 +3441,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release ) endif() - add_test(NAME CMakeWizardTest COMMAND cmake -i) - set_property(TEST CMakeWizardTest PROPERTY PASS_REGULAR_EXPRESSION - "The \"cmake -i\" wizard mode is no longer supported.") - # Define a set of "contract" tests, each activated by a cache entry # named "CMake_TEST_CONTRACT_<project>". For each Contract test, # the project should provide a directory with a CMakeLists.txt file diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index 3bb2a89..cef2b9b 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.1) include(RunCMake) run_cmake_command(NoArgs ${CMAKE_COMMAND}) +run_cmake_command(Wizard ${CMAKE_COMMAND} -i) run_cmake_command(C-no-arg ${CMAKE_COMMAND} -C) run_cmake_command(C-no-file ${CMAKE_COMMAND} -C nosuchcachefile.txt) run_cmake_command(cache-no-file ${CMAKE_COMMAND} nosuchsubdir/CMakeCache.txt) diff --git a/Tests/RunCMake/CommandLine/Wizard-result.txt b/Tests/RunCMake/CommandLine/Wizard-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/CommandLine/Wizard-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/CommandLine/Wizard-stderr.txt b/Tests/RunCMake/CommandLine/Wizard-stderr.txt new file mode 100644 index 0000000..f757aff --- /dev/null +++ b/Tests/RunCMake/CommandLine/Wizard-stderr.txt @@ -0,0 +1 @@ +^The "cmake -i" wizard mode is no longer supported\. |