From 022f20f6632c934169f440271cabe8c7e52cce6e Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Wed, 29 Nov 2023 22:51:00 +0100 Subject: ctest: add command line option to run the tests listed in a given file Add `--tests-from-file ` to run only the tests listed in the given file. The test names must match exactly, no regexps or something. The listed tests can still be filtered with a regexp using -R. Issue: #25455 --- Help/manual/ctest.1.rst | 12 +++++++ Help/release/dev/ctest-tests-from-file.rst | 5 +++ Source/CTest/cmCTestTestHandler.cxx | 41 ++++++++++++++++++++++ Source/CTest/cmCTestTestHandler.h | 3 ++ Source/cmCTest.cxx | 7 ++++ Source/ctest.cxx | 1 + Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 17 +++++++++ .../CTestCommandLine/TestsFromFile-TestList.txt | 2 ++ .../TestsFromFile-tests-from-file-stdout.txt | 5 +++ 9 files changed, 93 insertions(+) create mode 100644 Help/release/dev/ctest-tests-from-file.rst create mode 100644 Tests/RunCMake/CTestCommandLine/TestsFromFile-TestList.txt create mode 100644 Tests/RunCMake/CTestCommandLine/TestsFromFile-tests-from-file-stdout.txt diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 1924d4f..1174725 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -234,6 +234,18 @@ Run Tests of the test's labels (i.e. the multiple ``-LE`` labels form an ``AND`` relationship). See `Label Matching`_. +.. option:: --tests-from-file + + .. versionadded:: 3.29 + + Run tests listed in the given file. + + This option tells CTest to run the tests which are listed in the given + file. The file must contain one exact test name per line. + Lines can be commented out using a ``#``. + This option can be combined with the other options like + ``-R``, ``-E``, ``-L`` or ``-LE``. + .. option:: -FA , --fixture-exclude-any Exclude fixtures matching ```` from automatically adding any tests to diff --git a/Help/release/dev/ctest-tests-from-file.rst b/Help/release/dev/ctest-tests-from-file.rst new file mode 100644 index 0000000..f0abda9 --- /dev/null +++ b/Help/release/dev/ctest-tests-from-file.rst @@ -0,0 +1,5 @@ +ctest-tests-from-file +--------------------- + +* :manual:`ctest(1)` gained the :option:`--tests-from-file ` option to run tests named in a file. diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 1918b2c..3754ec2 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -345,6 +345,7 @@ void cmCTestTestHandler::Initialize() this->ExcludeFixtureRegExp.clear(); this->ExcludeFixtureSetupRegExp.clear(); this->ExcludeFixtureCleanupRegExp.clear(); + this->TestListFile.clear(); this->TestsToRunString.clear(); this->UseUnion = false; @@ -585,6 +586,10 @@ bool cmCTestTestHandler::ProcessOptions() if (val) { this->ResourceSpecFile = *val; } + val = this->GetOption("TestListFile"); + if (val) { + this->TestListFile = val; + } this->SetRerunFailed(cmIsOn(this->GetOption("RerunFailed"))); return true; @@ -933,6 +938,14 @@ bool cmCTestTestHandler::ComputeTestList() continue; } } + + if (!this->TestsToRunByName.empty()) { + if (this->TestsToRunByName.find(tp.Name) == + this->TestsToRunByName.end()) { + continue; + } + } + tp.Index = cnt; // save the index into the test list for this test finalList.push_back(tp); } @@ -1818,6 +1831,11 @@ bool cmCTestTestHandler::GetListOfTests() if (this->ResourceSpecFile.empty() && specFile) { this->ResourceSpecFile = *specFile; } + + if (!this->TestListFile.empty()) { + this->ReadTestListFile(this->TestListFile); + } + cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Done constructing a list of tests" << std::endl, this->Quiet); @@ -1986,6 +2004,29 @@ void cmCTestTestHandler::ExpandTestsToRunInformationForRerunFailed() } } +void cmCTestTestHandler::ReadTestListFile(const std::string& testListFileName) +{ + cmsys::ifstream ifs(testListFileName.c_str()); + if (ifs) { + std::string line; + while (cmSystemTools::GetLineFromStream(ifs, line)) { + std::string trimmed = cmTrimWhitespace(line); + if (trimmed.empty() || (trimmed[0] == '#')) { + continue; + } + + this->TestsToRunByName.insert(trimmed); + } + ifs.close(); + } else if (!this->CTest->GetShowOnly() && + !this->CTest->ShouldPrintLabels()) { + cmCTestLog(this->CTest, ERROR_MESSAGE, + "Problem reading test list file: " + << testListFileName + << " while generating list of tests to run." << std::endl); + } +} + void cmCTestTestHandler::RecordCustomTestMeasurements(cmXMLWriter& xml, std::string content) { diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index b81fcd5..c03bed8 100644 --- a/Source/CTest/cmCTestTestHandler.h +++ b/Source/CTest/cmCTestTestHandler.h @@ -341,6 +341,7 @@ private: std::string GetTestStatus(cmCTestTestResult const&); void ExpandTestsToRunInformation(size_t numPossibleTests); void ExpandTestsToRunInformationForRerunFailed(); + void ReadTestListFile(const std::string& testListFileName); std::vector CustomPreTest; std::vector CustomPostTest; @@ -359,6 +360,8 @@ private: std::vector ExcludeLabelRegularExpressions; cmsys::RegularExpression IncludeTestsRegularExpression; cmsys::RegularExpression ExcludeTestsRegularExpression; + std::string TestListFile; + std::set TestsToRunByName; std::string ResourceSpecFile; diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 6e684a3..a333c44 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -2224,6 +2224,13 @@ bool cmCTest::HandleCommandLineArguments(size_t& i, args[i]); } + else if (this->CheckArgument(arg, "--tests-from-file"_s) && + i < args.size() - 1) { + i++; + this->GetTestHandler()->SetPersistentOption("TestListFile", args[i]); + this->GetMemCheckHandler()->SetPersistentOption("TestListFile", args[i]); + } + else if (this->CheckArgument(arg, "--rerun-failed"_s)) { this->GetTestHandler()->SetPersistentOption("RerunFailed", "true"); this->GetMemCheckHandler()->SetPersistentOption("RerunFailed", "true"); diff --git a/Source/ctest.cxx b/Source/ctest.cxx index b2867e2..fbd90cd 100644 --- a/Source/ctest.cxx +++ b/Source/ctest.cxx @@ -107,6 +107,7 @@ const cmDocumentationEntry cmDocumentationOptions[] = { "Run a specific number of tests by number." }, { "-U, --union", "Take the Union of -I and -R" }, { "--rerun-failed", "Run only the tests that failed previously" }, + { "--tests-from-file ", "Run the tests listed in the given file" }, { "--repeat until-fail:, --repeat-until-fail ", "Require each test to run times without failing in order to pass" }, { "--repeat until-pass:", diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake index 1b8d0d9..96bef92 100644 --- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake @@ -207,6 +207,23 @@ set_tests_properties(test1 PROPERTIES SKIP_REGULAR_EXPRESSION \"test1\") endfunction() run_SkipRegexFoundTest() + +function(run_TestsFromFileTest arg) + set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/TestsFromFile) + set(RunCMake_TEST_NO_CLEAN 1) + file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") + file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") + + file(WRITE "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake" " +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 ) +endfunction() +run_TestsFromFileTest(tests-from-file) + + function(run_SerialFailed) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/SerialFailed) set(RunCMake_TEST_NO_CLEAN 1) diff --git a/Tests/RunCMake/CTestCommandLine/TestsFromFile-TestList.txt b/Tests/RunCMake/CTestCommandLine/TestsFromFile-TestList.txt new file mode 100644 index 0000000..91f6504 --- /dev/null +++ b/Tests/RunCMake/CTestCommandLine/TestsFromFile-TestList.txt @@ -0,0 +1,2 @@ +Test1 +# Test11 diff --git a/Tests/RunCMake/CTestCommandLine/TestsFromFile-tests-from-file-stdout.txt b/Tests/RunCMake/CTestCommandLine/TestsFromFile-tests-from-file-stdout.txt new file mode 100644 index 0000000..653d56c --- /dev/null +++ b/Tests/RunCMake/CTestCommandLine/TestsFromFile-tests-from-file-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 ++ -- cgit v0.12 From dbacc1d5a8c189289fe651ed9db892d9639354c6 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Thu, 30 Nov 2023 23:14:46 +0100 Subject: ctest: add command line option to exclude tests listed in a given file Add `--exclude-from-file ` to exclude the tests listed in the given file. Issue: #25455 --- Help/manual/ctest.1.rst | 12 ++++++++++ Help/release/dev/ctest-tests-from-file.rst | 3 ++- Source/CTest/cmCTestTestHandler.cxx | 27 +++++++++++++++++++--- Source/CTest/cmCTestTestHandler.h | 5 +++- Source/cmCTest.cxx | 9 ++++++++ Source/ctest.cxx | 2 ++ Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 1 + .../TestsFromFile-exclude-from-file-stdout.txt | 7 ++++++ 8 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-from-file-stdout.txt diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 1174725..602a82d 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -246,6 +246,18 @@ Run Tests This option can be combined with the other options like ``-R``, ``-E``, ``-L`` or ``-LE``. +.. option:: --exclude-from-file + + .. versionadded:: 3.29 + + Exclude tests listed in the given file. + + This option tells CTest to NOT run the tests which are listed in the given + file. The file must contain one exact test name per line. + Lines can be commented out using a ``#``. + This option can be combined with the other options like + ``-R``, ``-E``, ``-L`` or ``-LE``. + .. option:: -FA , --fixture-exclude-any Exclude fixtures matching ```` from automatically adding any tests to diff --git a/Help/release/dev/ctest-tests-from-file.rst b/Help/release/dev/ctest-tests-from-file.rst index f0abda9..470095f 100644 --- a/Help/release/dev/ctest-tests-from-file.rst +++ b/Help/release/dev/ctest-tests-from-file.rst @@ -2,4 +2,5 @@ ctest-tests-from-file --------------------- * :manual:`ctest(1)` gained the :option:`--tests-from-file ` option to run tests named in a file. + --tests-from-file>` and :option:`--exclude-from-file ` options to run or exclude tests named in a file. diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 3754ec2..dc16f66 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -346,6 +346,7 @@ void cmCTestTestHandler::Initialize() this->ExcludeFixtureSetupRegExp.clear(); this->ExcludeFixtureCleanupRegExp.clear(); this->TestListFile.clear(); + this->ExcludeTestListFile.clear(); this->TestsToRunString.clear(); this->UseUnion = false; @@ -590,6 +591,10 @@ bool cmCTestTestHandler::ProcessOptions() if (val) { this->TestListFile = val; } + val = this->GetOption("ExcludeTestListFile"); + if (val) { + this->ExcludeTestListFile = val; + } this->SetRerunFailed(cmIsOn(this->GetOption("RerunFailed"))); return true; @@ -946,6 +951,13 @@ bool cmCTestTestHandler::ComputeTestList() } } + if (!this->TestsToExcludeByName.empty()) { + if (this->TestsToExcludeByName.find(tp.Name) != + this->TestsToExcludeByName.end()) { + continue; + } + } + tp.Index = cnt; // save the index into the test list for this test finalList.push_back(tp); } @@ -1833,7 +1845,11 @@ bool cmCTestTestHandler::GetListOfTests() } if (!this->TestListFile.empty()) { - this->ReadTestListFile(this->TestListFile); + this->TestsToRunByName = this->ReadTestListFile(this->TestListFile); + } + if (!this->ExcludeTestListFile.empty()) { + this->TestsToExcludeByName = + this->ReadTestListFile(this->ExcludeTestListFile); } cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, @@ -2004,8 +2020,11 @@ void cmCTestTestHandler::ExpandTestsToRunInformationForRerunFailed() } } -void cmCTestTestHandler::ReadTestListFile(const std::string& testListFileName) +std::set cmCTestTestHandler::ReadTestListFile( + const std::string& testListFileName) const { + std::set testNames; + cmsys::ifstream ifs(testListFileName.c_str()); if (ifs) { std::string line; @@ -2015,7 +2034,7 @@ void cmCTestTestHandler::ReadTestListFile(const std::string& testListFileName) continue; } - this->TestsToRunByName.insert(trimmed); + testNames.insert(trimmed); } ifs.close(); } else if (!this->CTest->GetShowOnly() && @@ -2025,6 +2044,8 @@ void cmCTestTestHandler::ReadTestListFile(const std::string& testListFileName) << testListFileName << " while generating list of tests to run." << std::endl); } + + return testNames; } void cmCTestTestHandler::RecordCustomTestMeasurements(cmXMLWriter& xml, diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index c03bed8..84e6098 100644 --- a/Source/CTest/cmCTestTestHandler.h +++ b/Source/CTest/cmCTestTestHandler.h @@ -341,7 +341,8 @@ private: std::string GetTestStatus(cmCTestTestResult const&); void ExpandTestsToRunInformation(size_t numPossibleTests); void ExpandTestsToRunInformationForRerunFailed(); - void ReadTestListFile(const std::string& testListFileName); + std::set ReadTestListFile( + const std::string& testListFileName) const; std::vector CustomPreTest; std::vector CustomPostTest; @@ -361,7 +362,9 @@ private: cmsys::RegularExpression IncludeTestsRegularExpression; cmsys::RegularExpression ExcludeTestsRegularExpression; std::string TestListFile; + std::string ExcludeTestListFile; std::set TestsToRunByName; + std::set TestsToExcludeByName; std::string ResourceSpecFile; diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index a333c44..7acee4b 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -2231,6 +2231,15 @@ bool cmCTest::HandleCommandLineArguments(size_t& i, this->GetMemCheckHandler()->SetPersistentOption("TestListFile", args[i]); } + else if (this->CheckArgument(arg, "--exclude-from-file"_s) && + i < args.size() - 1) { + i++; + this->GetTestHandler()->SetPersistentOption("ExcludeTestListFile", + args[i]); + this->GetMemCheckHandler()->SetPersistentOption("ExcludeTestListFile", + args[i]); + } + else if (this->CheckArgument(arg, "--rerun-failed"_s)) { this->GetTestHandler()->SetPersistentOption("RerunFailed", "true"); this->GetMemCheckHandler()->SetPersistentOption("RerunFailed", "true"); diff --git a/Source/ctest.cxx b/Source/ctest.cxx index fbd90cd..c1c2071 100644 --- a/Source/ctest.cxx +++ b/Source/ctest.cxx @@ -108,6 +108,8 @@ const cmDocumentationEntry cmDocumentationOptions[] = { { "-U, --union", "Take the Union of -I and -R" }, { "--rerun-failed", "Run only the tests that failed previously" }, { "--tests-from-file ", "Run the tests listed in the given file" }, + { "--exclude-from-file ", + "Run tests except those listed in the given file" }, { "--repeat until-fail:, --repeat-until-fail ", "Require each test to run times without failing in order to pass" }, { "--repeat until-pass:", diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake index 96bef92..c09fff8 100644 --- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake @@ -222,6 +222,7 @@ add_test(Test11 \"${CMAKE_COMMAND}\" -E echo \"test11\") run_cmake_command(TestsFromFile-${arg} ${CMAKE_CTEST_COMMAND} --${arg} ${RunCMake_SOURCE_DIR}/TestsFromFile-TestList.txt ) endfunction() run_TestsFromFileTest(tests-from-file) +run_TestsFromFileTest(exclude-from-file) 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 new file mode 100644 index 0000000..96d8c3b --- /dev/null +++ b/Tests/RunCMake/CTestCommandLine/TestsFromFile-exclude-from-file-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 ++ -- cgit v0.12 From 701029726f17759a84b963e2f318742a1761670a Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Sun, 3 Dec 2023 17:59:10 +0100 Subject: ctest_test: add options INCLUDE_FROM_FILE and EXCLUDE_FROM_FILE These options can be used to specify files which can be used to restrict the set of tests that will be executed. Fixes: #25455 --- Help/command/ctest_test.rst | 12 ++++++++++++ Help/release/dev/ctest-tests-from-file.rst | 4 ++++ Source/CTest/cmCTestTestCommand.cxx | 10 ++++++++++ Source/CTest/cmCTestTestCommand.h | 2 ++ Tests/RunCMake/ctest_test/RunCMakeTest.cmake | 16 ++++++++++++++++ .../TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt | 7 +++++++ .../TestsFromFile-INCLUDE_FROM_FILE-stdout.txt | 5 +++++ Tests/RunCMake/ctest_test/TestsFromFile-TestList.txt | 2 ++ 8 files changed, 58 insertions(+) create mode 100644 Tests/RunCMake/ctest_test/TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt create mode 100644 Tests/RunCMake/ctest_test/TestsFromFile-INCLUDE_FROM_FILE-stdout.txt create mode 100644 Tests/RunCMake/ctest_test/TestsFromFile-TestList.txt diff --git a/Help/command/ctest_test.rst b/Help/command/ctest_test.rst index cf20ade..4d56577 100644 --- a/Help/command/ctest_test.rst +++ b/Help/command/ctest_test.rst @@ -13,6 +13,8 @@ Perform the :ref:`CTest Test Step` as a :ref:`Dashboard Client`. [INCLUDE ] [EXCLUDE_LABEL ] [INCLUDE_LABEL ] + [EXCLUDE_FROM_FILE ] + [INCLUDE_FROM_FILE ] [EXCLUDE_FIXTURE ] [EXCLUDE_FIXTURE_SETUP ] [EXCLUDE_FIXTURE_CLEANUP ] @@ -72,6 +74,16 @@ The options are: Specify a regular expression matching test labels to include. Tests not matching this expression are excluded. +``EXCLUDE_FROM_FILE `` + .. versionadded:: 3.29 + + Do NOT run tests listed with their exact name in the given file. + +``INCLUDE_FROM_FILE `` + .. versionadded:: 3.29 + + Only run the tests listed with their exact name in the given file. + ``EXCLUDE_FIXTURE `` .. versionadded:: 3.7 diff --git a/Help/release/dev/ctest-tests-from-file.rst b/Help/release/dev/ctest-tests-from-file.rst index 470095f..aa49368 100644 --- a/Help/release/dev/ctest-tests-from-file.rst +++ b/Help/release/dev/ctest-tests-from-file.rst @@ -4,3 +4,7 @@ ctest-tests-from-file * :manual:`ctest(1)` gained the :option:`--tests-from-file ` and :option:`--exclude-from-file ` options to run or exclude tests named in a file. + +* The :command:`ctest_test` command gained options + ``INCLUDE_FROM_FILE`` and ``EXCLUDE_FROM_FILE`` to run or exclude + tests named in a file. diff --git a/Source/CTest/cmCTestTestCommand.cxx b/Source/CTest/cmCTestTestCommand.cxx index c717868..ed16354 100644 --- a/Source/CTest/cmCTestTestCommand.cxx +++ b/Source/CTest/cmCTestTestCommand.cxx @@ -26,6 +26,8 @@ void cmCTestTestCommand::BindArguments() this->Bind("INCLUDE"_s, this->Include); this->Bind("EXCLUDE_LABEL"_s, this->ExcludeLabel); this->Bind("INCLUDE_LABEL"_s, this->IncludeLabel); + this->Bind("EXCLUDE_FROM_FILE"_s, this->ExcludeTestsFromFile); + this->Bind("INCLUDE_FROM_FILE"_s, this->IncludeTestsFromFile); this->Bind("EXCLUDE_FIXTURE"_s, this->ExcludeFixture); this->Bind("EXCLUDE_FIXTURE_SETUP"_s, this->ExcludeFixtureSetup); this->Bind("EXCLUDE_FIXTURE_CLEANUP"_s, this->ExcludeFixtureCleanup); @@ -80,6 +82,14 @@ cmCTestGenericHandler* cmCTestTestCommand::InitializeHandler() if (!this->IncludeLabel.empty()) { handler->AddMultiOption("LabelRegularExpression", this->IncludeLabel); } + + if (!this->ExcludeTestsFromFile.empty()) { + handler->SetOption("ExcludeTestListFile", this->ExcludeTestsFromFile); + } + if (!this->IncludeTestsFromFile.empty()) { + handler->SetOption("TestListFile", this->IncludeTestsFromFile); + } + if (!this->ExcludeFixture.empty()) { handler->SetOption("ExcludeFixtureRegularExpression", this->ExcludeFixture); diff --git a/Source/CTest/cmCTestTestCommand.h b/Source/CTest/cmCTestTestCommand.h index 24e74e2..ce054ed 100644 --- a/Source/CTest/cmCTestTestCommand.h +++ b/Source/CTest/cmCTestTestCommand.h @@ -51,6 +51,8 @@ protected: std::string Include; std::string ExcludeLabel; std::string IncludeLabel; + std::string IncludeTestsFromFile; + std::string ExcludeTestsFromFile; std::string ExcludeFixture; std::string ExcludeFixtureSetup; std::string ExcludeFixtureCleanup; diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake index b1ec9ad..4413a4d 100644 --- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake @@ -163,6 +163,22 @@ add_test(NAME NotRunTest COMMAND ${CMAKE_COMMAND} -E true) endfunction() 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) + 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}) +endfunction() +run_tests_from_file(INCLUDE_FROM_FILE) +run_tests_from_file(EXCLUDE_FROM_FILE) + + # Make sure environment gets logged function(run_environment) set(ENV{BAD_ENVIRONMENT_VARIABLE} "Bad environment variable") diff --git a/Tests/RunCMake/ctest_test/TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt b/Tests/RunCMake/ctest_test/TestsFromFile-EXCLUDE_FROM_FILE-stdout.txt new file mode 100644 index 0000000..29c2b7f --- /dev/null +++ b/Tests/RunCMake/ctest_test/TestsFromFile-EXCLUDE_FROM_FILE-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_FROM_FILE-stdout.txt b/Tests/RunCMake/ctest_test/TestsFromFile-INCLUDE_FROM_FILE-stdout.txt new file mode 100644 index 0000000..e3ca719 --- /dev/null +++ b/Tests/RunCMake/ctest_test/TestsFromFile-INCLUDE_FROM_FILE-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 ++ diff --git a/Tests/RunCMake/ctest_test/TestsFromFile-TestList.txt b/Tests/RunCMake/ctest_test/TestsFromFile-TestList.txt new file mode 100644 index 0000000..91f6504 --- /dev/null +++ b/Tests/RunCMake/ctest_test/TestsFromFile-TestList.txt @@ -0,0 +1,2 @@ +Test1 +# Test11 -- cgit v0.12