[Cmake-commits] CMake branch, next, updated. v3.0.0-4423-gcbd554f

[Bill Hoffman]

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  cbd554fbd01117866dd11eaac3b0d014d8f4552d (commit)
       via  f7d62cac79f856c9c7b634ed7f5d2f6030b7ba76 (commit)
       via  08bb09a944ecccb5d5f25c847be7b30a70ccf7c4 (commit)
      from  2432d11a01cdfce3bfbb8d866a5f3a45f200b8dd (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbd554fbd01117866dd11eaac3b0d014d8f4552d
commit cbd554fbd01117866dd11eaac3b0d014d8f4552d
Merge: 2432d11 f7d62ca
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Jul 22 10:54:20 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 22 10:54:20 2014 -0400

    Merge topic 'fix_sanitizer_test_to_work_with_sanitizer' into next
    
    f7d62cac Fix leak and address sanitizer tests to be able to run with real tools.
    08bb09a9 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7d62cac79f856c9c7b634ed7f5d2f6030b7ba76
commit f7d62cac79f856c9c7b634ed7f5d2f6030b7ba76
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Jul 22 10:51:53 2014 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Jul 22 10:51:53 2014 -0400

    Fix leak and address sanitizer tests to be able to run with real tools.
    
    When running CMake under Leak or Address Sanitizer tools, the fake reporting
    would get picked up by the outer CMake and reported as leaks and address
    failures on the CMake dashboard. This commit makes sure the test only
    reports simulated errors when asked to.

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index d16d432..0f38431 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -121,7 +121,7 @@ set(CTEST_EXTRA_CODE)
 
 # add LeakSanitizer test
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"report_bugs=1 history_size=5 exitcode=55\")
+"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\")
 ")
 
 set(CMAKELISTS_EXTRA_CODE
@@ -136,7 +136,7 @@ set_tests_properties(CTestTestMemcheckDummyLeakSanitizer PROPERTIES
     ".*Memory checking results:.*Direct leak - 2.*Indirect leak - 1.*")
 # add AddressSanitizer test
 set(CTEST_EXTRA_CODE
-"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"report_bugs=1 history_size=5 exitcode=55\")
+"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1 report_bugs=1 history_size=5 exitcode=55\")
 ")
 
 set(CMAKELISTS_EXTRA_CODE
diff --git a/Tests/CTestTestMemcheck/testAddressSanitizer.cmake b/Tests/CTestTestMemcheck/testAddressSanitizer.cmake
index a359e28..a073151 100644
--- a/Tests/CTestTestMemcheck/testAddressSanitizer.cmake
+++ b/Tests/CTestTestMemcheck/testAddressSanitizer.cmake
@@ -5,6 +5,10 @@ message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
 string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
 
+# if we are not asked to simulate address sanitizer don't do it
+if(NOT "$ENV{ASAN_OPTIONS}]" MATCHES "simulate_sanitizer.1")
+  return()
+endif()
 # clear the log file
 file(REMOVE "${LOG_FILE}.2343")
 
diff --git a/Tests/CTestTestMemcheck/testLeakSanitizer.cmake b/Tests/CTestTestMemcheck/testLeakSanitizer.cmake
index ca0a264..d0e38ce 100644
--- a/Tests/CTestTestMemcheck/testLeakSanitizer.cmake
+++ b/Tests/CTestTestMemcheck/testLeakSanitizer.cmake
@@ -4,6 +4,10 @@
 message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]")
 string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}")
 message("LOG_FILE=[${LOG_FILE}]")
+# if we are not asked to simulate leak sanitizer don't do it
+if(NOT "$ENV{ASAN_OPTIONS}]" MATCHES "simulate_sanitizer.1")
+  return()
+endif()
 
 # clear the log file
 file(REMOVE "${LOG_FILE}.2343")

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

Summary of changes:
 Source/CMakeVersion.cmake                          |    2 +-
 Tests/CTestTestMemcheck/CMakeLists.txt             |    4 ++--
 Tests/CTestTestMemcheck/testAddressSanitizer.cmake |    4 ++++
 Tests/CTestTestMemcheck/testLeakSanitizer.cmake    |    4 ++++
 4 files changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake