mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 23:28:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

ctest_memcheck: Change failure to find log file from error to warning

Browse Source 
Sanitizers do not create a log file when no defects are found. Therefore,
it is currently impossible for ctest_memcheck to set both
`CAPTURE_CMAKE_ERROR` and `RETURN_VALUE` to zero.


With defects, `CAPTURE_CMAKE_ERROR`=0 and `RETURN_VALUE`=-1, as expected.

With no defects, `CAPTURE_CMAKE_ERROR`=-1 and `RETURN_VALUE`=0.
This commit is contained in:
Betsy McPhail
2018-08-28 16:45:49 -04:00
parent ca7507cebc
commit 5aaaee5e9e
11 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CTest/cmCTestMemCheckHandler.cxx
+2 -2
View File
@@ -1087,7 +1087,7 @@ void cmCTestMemCheckHandler::TestOutputFileNames(
g.FindFiles(ofile); g.FindFiles(ofile);
if (g.GetFiles().empty()) { if (g.GetFiles().empty()) {
std::string log = "Cannot find memory tester output file: " + ofile; std::string log = "Cannot find memory tester output file: " + ofile;
cmCTestLog(this->CTest, ERROR_MESSAGE, log << std::endl); cmCTestLog(this->CTest, WARNING, log << std::endl);
ofile.clear(); ofile.clear();
} else { } else {
files = g.GetFiles(); files = g.GetFiles();
@@ -1095,7 +1095,7 @@ void cmCTestMemCheckHandler::TestOutputFileNames(
} }
} else if (!cmSystemTools::FileExists(ofile)) { } else if (!cmSystemTools::FileExists(ofile)) {
std::string log = "Cannot find memory tester output file: " + ofile; std::string log = "Cannot find memory tester output file: " + ofile;
cmCTestLog(this->CTest, ERROR_MESSAGE, log << std::endl); cmCTestLog(this->CTest, WARNING, log << std::endl);
ofile.clear(); ofile.clear();
} }
files.push_back(std::move(ofile)); files.push_back(std::move(ofile));
Tests/RunCMake/ctest_memcheck/DummyAddressLeakSanitizer-result.txt
-1
View File
@@ -1 +0,0 @@
(-1|255)
Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-result.txt
-1
View File
@@ -1 +0,0 @@
(-1|255)
Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-result.txt
-1
View File
@@ -1 +0,0 @@
(-1|255)
Tests/RunCMake/ctest_memcheck/DummyLeakSanitizerPrintDefects-result.txt
-1
View File
@@ -1 +0,0 @@
(-1|255)
Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-result.txt
-1
View File
@@ -1 +0,0 @@
(-1|255)
Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-result.txt
-1
View File
@@ -1 +0,0 @@
(-1|255)
Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-result.txt
-1
View File
@@ -1 +0,0 @@
(-1|255)
Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-result.txt
-1
View File
@@ -1 +0,0 @@
(-1|255)
Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-result.txt
-1
View File
@@ -1 +0,0 @@
(-1|255)
Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-result.txt
-1
View File
@@ -1 +0,0 @@
(-1|255)