From 60433fc6e82267011ff8cb62feb7611c696c87c0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 6 Mar 2024 13:20:31 -0500 Subject: Tests: Generalize ctest tests-from-file test cases --- Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 8 ++++---- .../TestsFromFile-exclude-from-file-stdout.txt | 7 ------- .../RunCMake/CTestCommandLine/TestsFromFile-exclude-stdout.txt | 7 +++++++ .../RunCMake/CTestCommandLine/TestsFromFile-include-stdout.txt | 5 +++++ .../CTestCommandLine/TestsFromFile-tests-from-file-stdout.txt | 5 ----- Tests/RunCMake/ctest_test/RunCMakeTest.cmake | 10 +++++----- .../ctest_test/TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt | 7 ------- .../ctest_test/TestsFromFile-INCLUDE_FROM_FILE-stdout.txt | 5 ----- Tests/RunCMake/ctest_test/TestsFromFile-exclude-stdout.txt | 7 +++++++ Tests/RunCMake/ctest_test/TestsFromFile-include-stdout.txt | 5 +++++ 10 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-from-file-stdout.txt create mode 100644 Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-stdout.txt create mode 100644 Tests/RunCMake/CTestCommandLine/TestsFromFile-include-stdout.txt delete mode 100644 Tests/RunCMake/CTestCommandLine/TestsFromFile-tests-from-file-stdout.txt delete mode 100644 Tests/RunCMake/ctest_test/TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt delete mode 100644 Tests/RunCMake/ctest_test/TestsFromFile-INCLUDE_FROM_FILE-stdout.txt create mode 100644 Tests/RunCMake/ctest_test/TestsFromFile-exclude-stdout.txt create mode 100644 Tests/RunCMake/ctest_test/TestsFromFile-include-stdout.txt diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake index c09fff8..e4a92ad 100644 --- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake @@ -208,7 +208,7 @@ endfunction() run_SkipRegexFoundTest() -function(run_TestsFromFileTest arg) +function(run_TestsFromFileTest case) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/TestsFromFile) set(RunCMake_TEST_NO_CLEAN 1) 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(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() -run_TestsFromFileTest(tests-from-file) -run_TestsFromFileTest(exclude-from-file) +run_TestsFromFileTest(include --tests-from-file ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt) +run_TestsFromFileTest(exclude --exclude-from-file ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt) function(run_SerialFailed) diff --git a/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-from-file-stdout.txt b/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-from-file-stdout.txt deleted file mode 100644 index 96d8c3b..0000000 --- a/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-from-file-stdout.txt +++ /dev/null @@ -1,7 +0,0 @@ - +Start 2: Test2 -1/2 Test #2: Test2 ............................ Passed +[0-9.]+ sec - +Start 3: Test11 -2/2 Test #3: Test11 ........................... Passed +[0-9.]+ sec -+ -100% tests passed, 0 tests failed out of 2 -+ diff --git a/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-stdout.txt b/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-stdout.txt new file mode 100644 index 0000000..96d8c3b --- /dev/null +++ b/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-stdout.txt @@ -0,0 +1,7 @@ + +Start 2: Test2 +1/2 Test #2: Test2 ............................ Passed +[0-9.]+ sec + +Start 3: Test11 +2/2 Test #3: Test11 ........................... Passed +[0-9.]+ sec ++ +100% tests passed, 0 tests failed out of 2 ++ diff --git a/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-stdout.txt b/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-stdout.txt new file mode 100644 index 0000000..653d56c --- /dev/null +++ b/Tests/RunCMake/CTestCommandLine/TestsFromFile-include-stdout.txt @@ -0,0 +1,5 @@ + +Start 1: Test1 +1/1 Test #1: Test1 ............................ Passed +[0-9.]+ sec ++ +100% tests passed, 0 tests failed out of 1 ++ diff --git a/Tests/RunCMake/CTestCommandLine/TestsFromFile-tests-from-file-stdout.txt b/Tests/RunCMake/CTestCommandLine/TestsFromFile-tests-from-file-stdout.txt deleted file mode 100644 index 653d56c..0000000 --- a/Tests/RunCMake/CTestCommandLine/TestsFromFile-tests-from-file-stdout.txt +++ /dev/null @@ -1,5 +0,0 @@ - +Start 1: Test1 -1/1 Test #1: Test1 ............................ Passed +[0-9.]+ sec -+ -100% tests passed, 0 tests failed out of 1 -+ diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake index 4413a4d..d4250c4 100644 --- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake @@ -165,18 +165,18 @@ run_stop_on_failure() # test include/exclude tests from file -function(run_tests_from_file mode) - set(CASE_CTEST_TEST_ARGS ${mode} ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt) +function(run_tests_from_file case) + set(CASE_CTEST_TEST_ARGS ${ARGN}) set(CASE_CMAKELISTS_SUFFIX_CODE [[ add_test(NAME Test1 COMMAND ${CMAKE_COMMAND} -E true) add_test(NAME Test2 COMMAND ${CMAKE_COMMAND} -E true) add_test(NAME Test11 COMMAND ${CMAKE_COMMAND} -E true) ]]) - run_ctest(TestsFromFile-${mode}) + run_ctest(TestsFromFile-${case}) endfunction() -run_tests_from_file(INCLUDE_FROM_FILE) -run_tests_from_file(EXCLUDE_FROM_FILE) +run_tests_from_file(include INCLUDE_FROM_FILE ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt) +run_tests_from_file(exclude EXCLUDE_FROM_FILE ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt) # Make sure environment gets logged diff --git a/Tests/RunCMake/ctest_test/TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt b/Tests/RunCMake/ctest_test/TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt deleted file mode 100644 index 29c2b7f..0000000 --- a/Tests/RunCMake/ctest_test/TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt +++ /dev/null @@ -1,7 +0,0 @@ - +Start 3: Test2 -2/3 Test #3: Test2 ............................ Passed +[0-9.]+ sec - +Start 4: Test11 -3/3 Test #4: Test11 ........................... Passed +[0-9.]+ sec -+ -100% tests passed, 0 tests failed out of 3 -+ diff --git a/Tests/RunCMake/ctest_test/TestsFromFile-INCLUDE_FROM_FILE-stdout.txt b/Tests/RunCMake/ctest_test/TestsFromFile-INCLUDE_FROM_FILE-stdout.txt deleted file mode 100644 index e3ca719..0000000 --- a/Tests/RunCMake/ctest_test/TestsFromFile-INCLUDE_FROM_FILE-stdout.txt +++ /dev/null @@ -1,5 +0,0 @@ - +Start 2: Test1 -1/1 Test #2: Test1 ............................ Passed +[0-9.]+ sec -+ -100% tests passed, 0 tests failed out of 1 -+ diff --git a/Tests/RunCMake/ctest_test/TestsFromFile-exclude-stdout.txt b/Tests/RunCMake/ctest_test/TestsFromFile-exclude-stdout.txt new file mode 100644 index 0000000..29c2b7f --- /dev/null +++ b/Tests/RunCMake/ctest_test/TestsFromFile-exclude-stdout.txt @@ -0,0 +1,7 @@ + +Start 3: Test2 +2/3 Test #3: Test2 ............................ Passed +[0-9.]+ sec + +Start 4: Test11 +3/3 Test #4: Test11 ........................... Passed +[0-9.]+ sec ++ +100% tests passed, 0 tests failed out of 3 ++ diff --git a/Tests/RunCMake/ctest_test/TestsFromFile-include-stdout.txt b/Tests/RunCMake/ctest_test/TestsFromFile-include-stdout.txt new file mode 100644 index 0000000..e3ca719 --- /dev/null +++ b/Tests/RunCMake/ctest_test/TestsFromFile-include-stdout.txt @@ -0,0 +1,5 @@ + +Start 2: Test1 +1/1 Test #2: Test1 ............................ Passed +[0-9.]+ sec ++ +100% tests passed, 0 tests failed out of 1 ++ -- cgit v0.12