diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-16 19:18:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-17 17:01:07 (GMT) |
| commit | 7370b02c36b45bcd92b6c5bb7cc65ecff75b9b2b (patch) | |
| tree | 8e59900befca0eed85a6e0ac0e2c831165fd92a1 | |
| parent | 62fec84ad7b44b7c54130e9eb3686f4fbc22672e (diff) | |
| download | CMake-7370b02c36b45bcd92b6c5bb7cc65ecff75b9b2b.zip CMake-7370b02c36b45bcd92b6c5bb7cc65ecff75b9b2b.tar.gz CMake-7370b02c36b45bcd92b6c5bb7cc65ecff75b9b2b.tar.bz2 | |
CTest: Teach --show-only=json-v1 to filter out not-available tests
Avoid exposing the internal special value that we use to track tests not
available in the tested configuration. This also prevents clients from
having to do the filtering themselves.
| -rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index 8867323..320647a 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -1039,6 +1039,11 @@ void cmCTestMultiProcessHandler::PrintOutputAsJson() testRun.SetTestProperties(&p); testRun.ComputeArguments(); + // Skip tests not available in this configuration. + if (p.Args.size() >= 2 && p.Args[1] == "NOT_AVAILABLE") { + continue; + } + Json::Value testInfo = DumpCTestInfo(testRun, p, backtraceGraph); tests.append(testInfo); } diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake index 52002ce..82bd963 100644 --- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake @@ -201,6 +201,7 @@ function(run_ShowOnly) file(WRITE "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake" " add_test(ShowOnly \"${CMAKE_COMMAND}\" -E echo) set_tests_properties(ShowOnly PROPERTIES WILL_FAIL true _BACKTRACE_TRIPLES \"file1;1;add_test;file0;;\") + add_test(ShowOnlyNotAvailable NOT_AVAILABLE) ") run_cmake_command(show-only_json-v1 ${CMAKE_CTEST_COMMAND} --show-only=json-v1) endfunction() |