[Cmake-commits] CMake branch, next, updated. v3.7.2-2268-g33fbedf

[Brad King]

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  33fbedfbf2858051489c4d5d7cbc04f7cfb8d81e (commit)
       via  64aeddeb1274793b8f3ec2a1369398620ebd5ef0 (commit)
      from  b65393034d79702fcb5b97a8ac1bb2abb7065553 (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=33fbedfbf2858051489c4d5d7cbc04f7cfb8d81e
commit 33fbedfbf2858051489c4d5d7cbc04f7cfb8d81e
Merge: b653930 64aedde
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 14:18:05 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 14:18:05 2017 -0500

    Merge topic 'sanitizer-options' into next
    
    64aeddeb Revert "ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64aeddeb1274793b8f3ec2a1369398620ebd5ef0
commit 64aeddeb1274793b8f3ec2a1369398620ebd5ef0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 14:17:46 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 14:17:46 2017 -0500

    Revert "ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty"
    
    This reverts commit 5a2d9200aa246b25dfa66a2c4cafe82f6c6c51fc.

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index beaef81..a062e64 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -607,13 +607,9 @@ 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("MemoryCheckSanitizerOptions")
-             .empty()) {
-        extraOptions = ":" +
-          this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions");
-      }
       if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile")
              .empty()) {
         suppressionsOption = ":suppressions=" +
@@ -636,7 +632,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking()
         envVar = "UBSAN_OPTIONS";
       }
       std::string outputFile =
-        envVar + "=log_path=" + this->MemoryTesterOutputFile;
+        envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\"";
       this->MemoryTesterEnvironmentVariable =
         outputFile + suppressionsOption + extraOptions;
       break;

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake