[Cmake-commits] CMake branch, next, updated. v3.7.2-2264-gde9eee5

[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  de9eee5f4cc05ef6dc161044d68b7400c60e2772 (commit)
       via  5a2d9200aa246b25dfa66a2c4cafe82f6c6c51fc (commit)
      from  b92afa6fb2d19eb8006bd2893f179953644b5439 (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=de9eee5f4cc05ef6dc161044d68b7400c60e2772
commit de9eee5f4cc05ef6dc161044d68b7400c60e2772
Merge: b92afa6 5a2d920
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 13:44:17 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 13:44:17 2017 -0500

    Merge topic 'sanitizer-options' into next
    
    5a2d9200 ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a2d9200aa246b25dfa66a2c4cafe82f6c6c51fc
commit 5a2d9200aa246b25dfa66a2c4cafe82f6c6c51fc
Author:     Jamie Snape <jamie.snape at kitware.com>
AuthorDate: Thu Jan 19 15:14:43 2017 -0500
Commit:     Jamie Snape <jamie.snape at kitware.com>
CommitDate: Thu Jan 19 15:14:43 2017 -0500

    ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index a062e64..beaef81 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=" +
@@ -632,7 +636,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, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake