diff options
author | Brad King <brad.king@kitware.com> | 2022-09-09 13:51:55 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-09 13:52:04 (GMT) |
commit | 669595723707d9104ef233b11ecd868d240636d8 (patch) | |
tree | 67fe37cffc915da34d23aec1626409d0ea743270 /Source | |
parent | 11754888a88362710dc2bdfed6211fd67d621f58 (diff) | |
parent | bd30d20bc328af37449b11c3b2b38f79a5be8db9 (diff) | |
download | CMake-669595723707d9104ef233b11ecd868d240636d8.zip CMake-669595723707d9104ef233b11ecd868d240636d8.tar.gz CMake-669595723707d9104ef233b11ecd868d240636d8.tar.bz2 |
Merge topic 'truncation_invalid' into release-3.24
bd30d20bc3 Tests: Add cases covering bad ctest output truncation types
dbf840392d ctest: print error for invalid CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7596
Diffstat (limited to 'Source')
-rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index d1fad62..daaf5fd 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -363,7 +363,11 @@ void cmCTestTestHandler::PopulateCustomVectors(cmMakefile* mf) cmValue dval = mf->GetDefinition("CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION"); if (dval) { - this->SetTestOutputTruncation(dval); + if (!this->SetTestOutputTruncation(dval)) { + cmCTestLog(this->CTest, ERROR_MESSAGE, + "Invalid value for CTEST_CUSTOM_TEST_OUTPUT_TRUNCATION: " + << dval << std::endl); + } } } |