summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-01-12 15:22:04 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2017-01-12 15:22:04 (GMT)
commit51255a7c7ade4b591b38ef6d61ce0f6a6ed96699 (patch)
tree1e397946b2e16d2a0c899d8da97ae911a9152a23
parente31986b90058a46071f7fe4a52788de6b42cb96c (diff)
parentefff7086c66d63c62d9474eca5a3b2d21d725bfe (diff)
downloadCMake-51255a7c7ade4b591b38ef6d61ce0f6a6ed96699.zip
CMake-51255a7c7ade4b591b38ef6d61ce0f6a6ed96699.tar.gz
CMake-51255a7c7ade4b591b38ef6d61ce0f6a6ed96699.tar.bz2
Merge topic 'asan_overriding_user_options'
efff7086 ctest_memcheck: Append sanitizers user options at the end to allow overriding
-rw-r--r--Source/CTest/cmCTestMemCheckHandler.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 4d23e45..a062e64 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -634,7 +634,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
std::string outputFile =
envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
this->MemoryTesterEnvironmentVariable =
- outputFile + extraOptions + suppressionsOption;
+ outputFile + suppressionsOption + extraOptions;
break;
}
default: