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 b4636f780f83e0da8431a5cfd6725878baf65aab (commit) via 7a9b109e598b5beea2f5d370a8ed60bf28ec29ba (commit) from deefc1319b83543ff4ffe65feded4ddc290b6a54 (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=b4636f780f83e0da8431a5cfd6725878baf65aab commit b4636f780f83e0da8431a5cfd6725878baf65aab Merge: deefc13 7a9b109 Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Jan 10 13:59:50 2017 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Jan 10 13:59:50 2017 -0500 Merge topic 'asan_overriding_user_options' into next 7a9b109e ctest_memcheck: Append sanitizers user options to allow overriding https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a9b109e598b5beea2f5d370a8ed60bf28ec29ba commit 7a9b109e598b5beea2f5d370a8ed60bf28ec29ba Author: Sylvain Joubert <joubert...@gmail.com> AuthorDate: Mon Dec 19 11:59:45 2016 +0100 Commit: Sylvain Joubert <joubert...@gmail.com> CommitDate: Mon Dec 19 11:59:45 2016 +0100 ctest_memcheck: Append sanitizers user options to allow overriding diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 2c31f60..8686d77 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 = "detect_leaks=1 " + extraOptions; } 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