summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-09-09 13:51:55 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-09-09 13:52:06 (GMT)
commit29c0633793261a4852979d0ac6d57b5d8561f0de (patch)
tree460b545f7de9d1e5d70573608379df605309438c /Source/CTest
parent13fe11fb188373abb35ff403366c0febe7596699 (diff)
parentbd30d20bc328af37449b11c3b2b38f79a5be8db9 (diff)
downloadCMake-29c0633793261a4852979d0ac6d57b5d8561f0de.zip
CMake-29c0633793261a4852979d0ac6d57b5d8561f0de.tar.gz
CMake-29c0633793261a4852979d0ac6d57b5d8561f0de.tar.bz2
Merge topic 'truncation_invalid'
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/CTest')
-rw-r--r--Source/CTest/cmCTestTestHandler.cxx6
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);
+ }
}
}