diff options
| author | Jamie Snape <jamie.snape@kitware.com> | 2017-01-23 15:50:38 (GMT) |
|---|---|---|
| committer | Jamie Snape <jamie.snape@kitware.com> | 2017-01-23 15:50:38 (GMT) |
| commit | e116f2a5de330ca4dd413e29db62ed39805b2c06 (patch) | |
| tree | 1839549bc5a964155d71da543c06ba769d4d2428 /Source/CTest | |
| parent | 522e1588ec7bfdbc86199cc1991e706ebafc02fd (diff) | |
| download | CMake-e116f2a5de330ca4dd413e29db62ed39805b2c06.zip CMake-e116f2a5de330ca4dd413e29db62ed39805b2c06.tar.gz CMake-e116f2a5de330ca4dd413e29db62ed39805b2c06.tar.bz2 | |
ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty
Diffstat (limited to 'Source/CTest')
| -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 a062e64..620e237 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -607,9 +607,13 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() this->MemoryTesterDynamicOptions.push_back("-E"); this->MemoryTesterDynamicOptions.push_back("env"); std::string envVar; - std::string extraOptions = ":" + - this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions"); + std::string extraOptions; std::string suppressionsOption; + if (!this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions") + .empty()) { + extraOptions = ":" + + this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions"); + } if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile") .empty()) { suppressionsOption = ":suppressions=" + @@ -631,8 +635,10 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() cmCTestMemCheckHandler::UB_SANITIZER) { envVar = "UBSAN_OPTIONS"; } + // Quote log_path with single quotes; see + // https://bugs.chromium.org/p/chromium/issues/detail?id=467936 std::string outputFile = - envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\""; + envVar + "=log_path='" + this->MemoryTesterOutputFile + "'"; this->MemoryTesterEnvironmentVariable = outputFile + suppressionsOption + extraOptions; break; |