mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-19 19:43:23 +08:00
Tests: Convert CTestTestSkipReturnCode to RunCMake.ctest_test case
This commit is contained in:
@@ -3073,19 +3073,6 @@ if(BUILD_TESTING)
|
||||
"Test command:.*Working Directory:.*Environment variables:.*foo=bar.*this=that"
|
||||
)
|
||||
|
||||
configure_file(
|
||||
"${CMake_SOURCE_DIR}/Tests/CTestTestSkipReturnCode/test.cmake.in"
|
||||
"${CMake_BINARY_DIR}/Tests/CTestTestSkipReturnCode/test.cmake"
|
||||
@ONLY ESCAPE_QUOTES)
|
||||
add_test(CTestTestSkipReturnCode ${CMAKE_CTEST_COMMAND}
|
||||
-S "${CMake_BINARY_DIR}/Tests/CTestTestSkipReturnCode/test.cmake" -V
|
||||
--output-log "${CMake_BINARY_DIR}/Tests/CTestTestSkipReturnCode/testOutput.log"
|
||||
-C \${CTEST_CONFIGURATION_TYPE}
|
||||
)
|
||||
set_tests_properties(CTestTestSkipReturnCode PROPERTIES
|
||||
PASS_REGULAR_EXPRESSION "CMakeV1 \\.* +Passed.*CMakeV2 \\.+\\*+Skipped")
|
||||
set_property(TEST CTestTestSkipReturnCode PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
|
||||
|
||||
ADD_TEST_MACRO(CTestTestSerialInDepends ${CMAKE_CTEST_COMMAND} -j 4
|
||||
--output-on-failure -C "\${CTestTest_CONFIG}")
|
||||
|
||||
|
@@ -1,8 +0,0 @@
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
project(CTestTestSkipReturnCode)
|
||||
include(CTest)
|
||||
|
||||
add_test (NAME CMakeV1 COMMAND ${CMAKE_COMMAND} "--version")
|
||||
add_test (NAME CMakeV2 COMMAND ${CMAKE_COMMAND} "--version")
|
||||
|
||||
set_tests_properties(CMakeV2 PROPERTIES SKIP_RETURN_CODE 0)
|
@@ -1,4 +0,0 @@
|
||||
set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
|
||||
set(CTEST_DROP_METHOD "http")
|
||||
set(CTEST_DROP_SITE "open.cdash.org")
|
||||
set(CTEST_DROP_LOCATION "/submit.php?project=PublicDashboard")
|
@@ -1,23 +0,0 @@
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
# Settings:
|
||||
set(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTest")
|
||||
set(CTEST_SITE "@SITE@")
|
||||
set(CTEST_BUILD_NAME "CTestTest-@BUILDNAME@-SkipReturnCode")
|
||||
|
||||
set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestSkipReturnCode")
|
||||
set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestSkipReturnCode")
|
||||
set(CTEST_CVS_COMMAND "@CVSCOMMAND@")
|
||||
set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
|
||||
set(CTEST_CMAKE_GENERATOR_PLATFORM "@CMAKE_GENERATOR_PLATFORM@")
|
||||
set(CTEST_CMAKE_GENERATOR_TOOLSET "@CMAKE_GENERATOR_TOOLSET@")
|
||||
set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}")
|
||||
set(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@")
|
||||
set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
|
||||
|
||||
#CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
|
||||
|
||||
CTEST_START(Experimental)
|
||||
CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
||||
CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
||||
CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
@@ -26,6 +26,13 @@ set_property(TEST test6 PROPERTY DEPENDS test1)
|
||||
run_ctest_test(SerialOrder INCLUDE test)
|
||||
unset(CASE_CMAKELISTS_SUFFIX_CODE)
|
||||
|
||||
set(CASE_CMAKELISTS_SUFFIX_CODE [[
|
||||
add_test(NAME skip COMMAND ${CMAKE_COMMAND} -E true)
|
||||
set_property(TEST skip PROPERTY SKIP_RETURN_CODE 0)
|
||||
]])
|
||||
run_ctest_test(SkipReturnCode)
|
||||
unset(CASE_CMAKELISTS_SUFFIX_CODE)
|
||||
|
||||
# Tests for the 'Test Load' feature of ctest
|
||||
#
|
||||
# Spoof a load average value to make these tests more reliable.
|
||||
|
8
Tests/RunCMake/ctest_test/SkipReturnCode-stdout.txt
Normal file
8
Tests/RunCMake/ctest_test/SkipReturnCode-stdout.txt
Normal file
@@ -0,0 +1,8 @@
|
||||
Test project [^
|
||||
]*/Tests/RunCMake/ctest_test/SkipReturnCode-build
|
||||
Start 1: RunCMakeVersion
|
||||
1/2 Test #1: RunCMakeVersion .................. Passed +[0-9.]+ sec
|
||||
Start 2: skip
|
||||
2/2 Test #2: skip .............................\*\*\*Skipped +[0-9.]+ sec
|
||||
+
|
||||
100% tests passed, 0 tests failed out of 2
|
Reference in New Issue
Block a user