diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-10 13:29:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-09-10 13:29:42 (GMT) |
| commit | a4fccf74af66755c2aeaa1cdba996ea48bf371b8 (patch) | |
| tree | 4eb52c25c7b943b02113ca8d8164885a12afe0e0 /Source | |
| parent | 118a0adf5bf5a8629fd75da9d30f7e5c475eebbc (diff) | |
| parent | ce44c2cec306e6d7266ba3e5444ee36bce879e3d (diff) | |
| download | CMake-a4fccf74af66755c2aeaa1cdba996ea48bf371b8.zip CMake-a4fccf74af66755c2aeaa1cdba996ea48bf371b8.tar.gz CMake-a4fccf74af66755c2aeaa1cdba996ea48bf371b8.tar.bz2 | |
Merge topic 'ctest-memcheck-generate-test.xml'
ce44c2cec3 ctest_memcheck: generate `DynamicAnalysis-Test.xml` as well
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6491
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 1 | ||||
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 5b54573..bf938e4 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -804,6 +804,7 @@ int cmCTestSubmitHandler::ProcessHandler() } } this->CTest->AddIfExists(cmCTest::PartMemCheck, "DynamicAnalysis.xml"); + this->CTest->AddIfExists(cmCTest::PartMemCheck, "DynamicAnalysis-Test.xml"); this->CTest->AddIfExists(cmCTest::PartMemCheck, "Purify.xml"); this->CTest->AddIfExists(cmCTest::PartNotes, "Notes.xml"); this->CTest->AddIfExists(cmCTest::PartUpload, "Upload.xml"); diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 1157d10..00c1443 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -705,6 +705,21 @@ bool cmCTestTestHandler::GenerateXML() this->GenerateCTestXML(xml); } + if (this->MemCheck) { + cmGeneratedFileStream xmlfile; + if (!this->StartResultingXML(cmCTest::PartTest, "DynamicAnalysis-Test", + xmlfile)) { + cmCTestLog(this->CTest, ERROR_MESSAGE, + "Cannot create testing XML file" << std::endl); + this->LogFile = nullptr; + return false; + } + cmXMLWriter xml(xmlfile); + // Explicitly call this class' `GenerateCTestXML` method to make `Test.xml` + // as well. + this->cmCTestTestHandler::GenerateCTestXML(xml); + } + return true; } |