diff options
| author | Martin Hořeňovský | 2019-06-16 16:12:47 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-10-29 14:07:18 +0100 |
| commit | d2cddfc9c5e1851dd46888f330ae324884f7c2c0 (patch) | |
| tree | f301f6f14152c6e791a1317c28a888cc8ce550bc /projects | |
| parent | 557b3361254f4503a34602d4ad8bd35fce33de8c (diff) | |
| download | catch3-d2cddfc9c5e1851dd46888f330ae324884f7c2c0.tar.gz | |
Make --list-* exit code be 0
Previously it returned the sum of listed things because ???. This
was completely useless and in many ways actively counterproductive
because of the success/failure conventions around exit codes.
Closes #1410
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/CMakeLists.txt | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index 0aafc178..e0e7b63e 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -376,24 +376,33 @@ set_tests_properties(RunTests PROPERTIES FAIL_REGULAR_EXPRESSION "Filters:" ) -add_test(NAME ListTests COMMAND $<TARGET_FILE:SelfTest> --list-tests --verbosity high) -set_tests_properties(ListTests PROPERTIES +# Because CTest does not allow us to check both return code _and_ expected +# output in one test, we run these commands twice. First time we check +# the output, the second time we check the exit code. +add_test(NAME List::Tests::Output COMMAND $<TARGET_FILE:SelfTest> --list-tests --verbosity high) +set_tests_properties(List::Tests::Output PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ test cases" FAIL_REGULAR_EXPRESSION "Hidden Test" ) +add_test(NAME List::Tests::ExitCode COMMAND $<TARGET_FILE:SelfTest> --list-tests --verbosity high) -add_test(NAME ListTags COMMAND $<TARGET_FILE:SelfTest> --list-tags) -set_tests_properties(ListTags PROPERTIES - PASS_REGULAR_EXPRESSION "[0-9]+ tags" +add_test(NAME List::Tags::Output COMMAND $<TARGET_FILE:SelfTest> --list-tags) +set_tests_properties(List::Tags::Output PROPERTIES + PASS_REGULAR_EXPRESSION "[0-9]+ tags" FAIL_REGULAR_EXPRESSION "\\[\\.\\]") +add_test(NAME List::Tags::ExitCode COMMAND $<TARGET_FILE:SelfTest> --list-tags) -add_test(NAME ListReporters COMMAND $<TARGET_FILE:SelfTest> --list-reporters) -set_tests_properties(ListReporters PROPERTIES PASS_REGULAR_EXPRESSION "Available reporters:") +add_test(NAME List::Reporters::Output COMMAND $<TARGET_FILE:SelfTest> --list-reporters) +set_tests_properties(List::Reporters::Output PROPERTIES PASS_REGULAR_EXPRESSION "Available reporters:") +add_test(NAME List::Reporters::ExitCode COMMAND $<TARGET_FILE:SelfTest> --list-reporters) -add_test(NAME ListTestNamesOnly COMMAND $<TARGET_FILE:SelfTest> --list-test-names-only) -set_tests_properties(ListTestNamesOnly PROPERTIES +add_test(NAME List::Tests::NamesOnly::Output COMMAND $<TARGET_FILE:SelfTest> --list-test-names-only) +set_tests_properties(List::Tests::NamesOnly::Output PROPERTIES PASS_REGULAR_EXPRESSION "Regex string matcher" FAIL_REGULAR_EXPRESSION "Hidden Test") +add_test(NAME List::Tests::NamesOnly::ExitCode COMMAND $<TARGET_FILE:SelfTest> --list-test-names-only) + + add_test(NAME NoAssertions COMMAND $<TARGET_FILE:SelfTest> -w NoAssertions) set_tests_properties(NoAssertions PROPERTIES PASS_REGULAR_EXPRESSION "No assertions in test case") |