mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Adopt wizard test in RunCMake.CommandLine

Browse Source 
Avoid a whole separate test for one removed command-line option.
This commit is contained in:
Brad King
2018-06-22 13:59:14 -04:00
parent 44ca3d922c
commit 7bffd71c3b
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/CMakeLists.txt
View File

@@ -3441,10 +3441,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
) )
endif() 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 # Define a set of "contract" tests, each activated by a cache entry
# named "CMake_TEST_CONTRACT_<project>". For each Contract test, # named "CMake_TEST_CONTRACT_<project>". For each Contract test,
# the project should provide a directory with a CMakeLists.txt file # the project should provide a directory with a CMakeLists.txt file

1
Tests/RunCMake/CommandLine/RunCMakeTest.cmake
View File

@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.1)
include(RunCMake) include(RunCMake)
run_cmake_command(NoArgs ${CMAKE_COMMAND}) 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-arg ${CMAKE_COMMAND} -C)
run_cmake_command(C-no-file ${CMAKE_COMMAND} -C nosuchcachefile.txt) run_cmake_command(C-no-file ${CMAKE_COMMAND} -C nosuchcachefile.txt)
run_cmake_command(cache-no-file ${CMAKE_COMMAND} nosuchsubdir/CMakeCache.txt) run_cmake_command(cache-no-file ${CMAKE_COMMAND} nosuchsubdir/CMakeCache.txt)

1
Tests/RunCMake/CommandLine/Wizard-result.txt Normal file
View File

@@ -0,0 +1 @@
1

1
Tests/RunCMake/CommandLine/Wizard-stderr.txt Normal file
View File

@@ -0,0 +1 @@
^The "cmake -i" wizard mode is no longer supported\.