This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via f1926db39ba43c3ba8d3397425fd93de71d6bbf1 (commit)
via 2ad86c4232bec1eb5205f67a350084cc77018f27 (commit)
from 202c24a3e137558723f8d781ccbdd3665daa8b2e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1926db39ba43c3ba8d3397425fd93de71d6bbf1
commit f1926db39ba43c3ba8d3397425fd93de71d6bbf1
Merge: 202c24a 2ad86c4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 10 14:16:52 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 14:16:52 2017 -0500
Merge topic 'asan_overriding_user_options' into next
2ad86c42 Revert "ctest_memcheck: Append sanitizers user options to allow
overriding"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ad86c4232bec1eb5205f67a350084cc77018f27
commit 2ad86c4232bec1eb5205f67a350084cc77018f27
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 10 14:16:45 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jan 10 14:16:45 2017 -0500
Revert "ctest_memcheck: Append sanitizers user options to allow overriding"
This reverts commit 7a9b109e598b5beea2f5d370a8ed60bf28ec29ba.
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx
b/Source/CTest/cmCTestMemCheckHandler.cxx
index 8686d77..2c31f60 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -602,7 +602,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
if (this->MemoryTesterStyle ==
cmCTestMemCheckHandler::ADDRESS_SANITIZER) {
envVar = "ASAN_OPTIONS";
- extraOptions = "detect_leaks=1 " + extraOptions;
+ extraOptions += " detect_leaks=1";
} else if (this->MemoryTesterStyle ==
cmCTestMemCheckHandler::THREAD_SANITIZER) {
envVar = "TSAN_OPTIONS";
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestMemCheckHandler.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
