Răsfoiți Sursa

Tests: Adopt wizard test in RunCMake.CommandLine

Avoid a whole separate test for one removed command-line option.
Brad King 7 ani în urmă
părinte
comite
7bffd71c3b

+ 0 - 4
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

+ 1 - 0
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)

+ 1 - 0
Tests/RunCMake/CommandLine/Wizard-result.txt

@@ -0,0 +1 @@
+1

+ 1 - 0
Tests/RunCMake/CommandLine/Wizard-stderr.txt

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