diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-15 15:28:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-15 15:28:52 (GMT) |
| commit | 2e792b6ec29762fff89ecf517d43b281e17a0814 (patch) | |
| tree | b6e23498ae61039c9c39c6ae0901a1aecbd44ed6 | |
| parent | 50b8dc8735e836658755e6dc3dc2a9f00e1006e1 (diff) | |
| parent | 54866346de24d46896bc22d717200035db9115bc (diff) | |
| download | CMake-2e792b6ec29762fff89ecf517d43b281e17a0814.zip CMake-2e792b6ec29762fff89ecf517d43b281e17a0814.tar.gz CMake-2e792b6ec29762fff89ecf517d43b281e17a0814.tar.bz2 | |
Merge topic 'sanitizers_save_memcheck_files'
54866346de CTest: Save sanitizer output files after test execution
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5698
| -rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 8a30dc0..6e8091b 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -1364,9 +1364,15 @@ void cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res, } } if (this->LogWithPID) { - cmSystemTools::RemoveFile(ofile); - cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, - "Remove: " << ofile << "\n", this->Quiet); + auto pos = ofile.find_last_of('.'); + if (pos != std::string::npos) { + auto ofileWithoutPid = ofile.substr(0, pos); + cmSystemTools::RenameFile(ofile, ofileWithoutPid); + cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, + "Renaming: " << ofile << " to: " << ofileWithoutPid + << "\n", + this->Quiet); + } } } |