summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestMemCheckHandler.cxx
diff options
context:
space:
mode:
authorJamie Snape <jamie.snape@kitware.com>2017-01-09 18:39:08 (GMT)
committerJamie Snape <jamie.snape@kitware.com>2017-01-09 18:39:08 (GMT)
commit0a2e588585a951b1f26cfa9094e0709f1d026b1e (patch)
tree692c6f09de840321837852e3e6c791bb6f837dfe /Source/CTest/cmCTestMemCheckHandler.cxx
parentcdacfbd255dcf640be7dd4971a1be616d015b3fd (diff)
downloadCMake-0a2e588585a951b1f26cfa9094e0709f1d026b1e.zip
CMake-0a2e588585a951b1f26cfa9094e0709f1d026b1e.tar.gz
CMake-0a2e588585a951b1f26cfa9094e0709f1d026b1e.tar.bz2
ctest_memcheck: join *SAN_OPTIONS with :
Diffstat (limited to 'Source/CTest/cmCTestMemCheckHandler.cxx')
-rw-r--r--Source/CTest/cmCTestMemCheckHandler.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 81b73aa..fc07249 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -607,18 +607,18 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
this->MemoryTesterDynamicOptions.push_back("-E");
this->MemoryTesterDynamicOptions.push_back("env");
std::string envVar;
- std::string extraOptions =
+ std::string extraOptions = ":" +
this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
std::string suppressionsOption;
if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile")
.empty()) {
- suppressionsOption = " suppressions=" +
+ suppressionsOption = ":suppressions=" +
this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile");
}
if (this->MemoryTesterStyle ==
cmCTestMemCheckHandler::ADDRESS_SANITIZER) {
envVar = "ASAN_OPTIONS";
- extraOptions += " detect_leaks=1";
+ extraOptions += ":detect_leaks=1";
} else if (this->MemoryTesterStyle ==
cmCTestMemCheckHandler::LEAK_SANITIZER) {
envVar = "LSAN_OPTIONS";
@@ -633,7 +633,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
envVar = "UBSAN_OPTIONS";
}
std::string outputFile =
- envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\" ";
+ envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
this->MemoryTesterEnvironmentVariable =
outputFile + extraOptions + suppressionsOption;
break;