diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-09 17:17:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-03-09 17:17:44 (GMT) |
| commit | cbd36eac23628f74ae3b50f9d1b8a0478c3e317a (patch) | |
| tree | 2a1a3b85f60dabb52eb3e7f2c5348a557c17b777 /Source/cmCMakePresetsGraph.cxx | |
| parent | 51e81d1f7354fc425b3fc210900cab37ca00926f (diff) | |
| parent | 140704d443e73c2dc74ac8192a109ae0c21e834a (diff) | |
| download | CMake-cbd36eac23628f74ae3b50f9d1b8a0478c3e317a.zip CMake-cbd36eac23628f74ae3b50f9d1b8a0478c3e317a.tar.gz CMake-cbd36eac23628f74ae3b50f9d1b8a0478c3e317a.tar.bz2 | |
Merge topic 'ctest_truncate'
140704d443 ctest: add option for output truncation
359e5b17d8 presets: bump version to v5
4634de335b cmCTestTestHandler: refactor CleanTestOutput method
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6993
Diffstat (limited to 'Source/cmCMakePresetsGraph.cxx')
| -rw-r--r-- | Source/cmCMakePresetsGraph.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmCMakePresetsGraph.cxx b/Source/cmCMakePresetsGraph.cxx index dc14831..478c175 100644 --- a/Source/cmCMakePresetsGraph.cxx +++ b/Source/cmCMakePresetsGraph.cxx @@ -781,6 +781,8 @@ cmCMakePresetsGraph::TestPreset::VisitPresetInherit( parentOutput.MaxPassedTestOutputSize); InheritOptionalValue(output.MaxFailedTestOutputSize, parentOutput.MaxFailedTestOutputSize); + InheritOptionalValue(output.TestOutputTruncation, + parentOutput.TestOutputTruncation); InheritOptionalValue(output.MaxTestNameWidth, parentOutput.MaxTestNameWidth); } else { @@ -1035,6 +1037,9 @@ const char* cmCMakePresetsGraph::ResultToString(ReadFileResult result) "support."; case ReadFileResult::CYCLIC_INCLUDE: return "Cyclic include among preset files"; + case ReadFileResult::TEST_OUTPUT_TRUNCATION_UNSUPPORTED: + return "File version must be 5 or higher for testOutputTruncation " + "preset support."; } return "Unknown error"; |