mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-30 11:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Generalize ctest tests-from-file test cases

Browse Source
This commit is contained in:
Brad King
2024-03-06 13:20:31 -05:00
parent dd8e84a8fa
commit 60433fc6e8
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+4 -4
View File
@@ -208,7 +208,7 @@ endfunction()
run_SkipRegexFoundTest() run_SkipRegexFoundTest()
function(run_TestsFromFileTest arg) function(run_TestsFromFileTest case)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/TestsFromFile) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/TestsFromFile)
set(RunCMake_TEST_NO_CLEAN 1) set(RunCMake_TEST_NO_CLEAN 1)
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
@@ -219,10 +219,10 @@ add_test(Test1 \"${CMAKE_COMMAND}\" -E echo \"test1\")
add_test(Test2 \"${CMAKE_COMMAND}\" -E echo \"test2\") add_test(Test2 \"${CMAKE_COMMAND}\" -E echo \"test2\")
add_test(Test11 \"${CMAKE_COMMAND}\" -E echo \"test11\") add_test(Test11 \"${CMAKE_COMMAND}\" -E echo \"test11\")
") ")
run_cmake_command(TestsFromFile-${arg} ${CMAKE_CTEST_COMMAND} --${arg} ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt ) run_cmake_command(TestsFromFile-${case} ${CMAKE_CTEST_COMMAND} ${ARGN})
endfunction() endfunction()
run_TestsFromFileTest(tests-from-file) run_TestsFromFileTest(include --tests-from-file ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt)
run_TestsFromFileTest(exclude-from-file) run_TestsFromFileTest(exclude --exclude-from-file ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt)
function(run_SerialFailed) function(run_SerialFailed)
Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-from-file-stdout.txt → Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-stdout.txt
View File
Tests/RunCMake/CTestCommandLine/TestsFromFile-tests-from-file-stdout.txt → Tests/RunCMake/CTestCommandLine/TestsFromFile-include-stdout.txt
View File
Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+5 -5
View File
@@ -165,18 +165,18 @@ run_stop_on_failure()
# test include/exclude tests from file # test include/exclude tests from file
function(run_tests_from_file mode) function(run_tests_from_file case)
set(CASE_CTEST_TEST_ARGS ${mode} ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt) set(CASE_CTEST_TEST_ARGS ${ARGN})
set(CASE_CMAKELISTS_SUFFIX_CODE [[ set(CASE_CMAKELISTS_SUFFIX_CODE [[
add_test(NAME Test1 COMMAND ${CMAKE_COMMAND} -E true) add_test(NAME Test1 COMMAND ${CMAKE_COMMAND} -E true)
add_test(NAME Test2 COMMAND ${CMAKE_COMMAND} -E true) add_test(NAME Test2 COMMAND ${CMAKE_COMMAND} -E true)
add_test(NAME Test11 COMMAND ${CMAKE_COMMAND} -E true) add_test(NAME Test11 COMMAND ${CMAKE_COMMAND} -E true)
]]) ]])
run_ctest(TestsFromFile-${mode}) run_ctest(TestsFromFile-${case})
endfunction() endfunction()
run_tests_from_file(INCLUDE_FROM_FILE) run_tests_from_file(include INCLUDE_FROM_FILE ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt)
run_tests_from_file(EXCLUDE_FROM_FILE) run_tests_from_file(exclude EXCLUDE_FROM_FILE ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt)
# Make sure environment gets logged # Make sure environment gets logged
Tests/RunCMake/ctest_test/TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt → Tests/RunCMake/ctest_test/TestsFromFile-exclude-stdout.txt
View File
Tests/RunCMake/ctest_test/TestsFromFile-INCLUDE_FROM_FILE-stdout.txt → Tests/RunCMake/ctest_test/TestsFromFile-include-stdout.txt
View File