[Cmake-commits] CMake branch, next, updated. v2.8.9-965-g9b11b20

[Rolf Eike Beer]

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  9b11b20fb0ddf37a1c5e64972f3ede1e719a9daf (commit)
       via  504bfca49cc4bdbc90db0473d421461341626484 (commit)
       via  4c453917fede3401286d336482637760387d7132 (commit)
      from  01810b47cbf4fa5b400e7a8e644998c542496ee0 (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=9b11b20fb0ddf37a1c5e64972f3ede1e719a9daf
commit 9b11b20fb0ddf37a1c5e64972f3ede1e719a9daf
Merge: 01810b4 504bfca
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Oct 2 14:59:01 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 2 14:59:01 2012 -0400

    Merge topic 'test-ctest-memcheck' into next
    
    504bfca memcheck test: fix tests failing because of Bullseye output
    4c45391 memcheck test: add workaround for Xcode bug


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=504bfca49cc4bdbc90db0473d421461341626484
commit 504bfca49cc4bdbc90db0473d421461341626484
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Oct 2 20:56:58 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Oct 2 20:56:58 2012 +0200

    memcheck test: fix tests failing because of Bullseye output

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 99db8c0..336a27a 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -50,11 +50,13 @@ set_tests_properties(CTestTestMemcheckUnknown PROPERTIES
 set_tests_properties(CTestTestMemcheckNotExist PROPERTIES
     PASS_REGULAR_EXPRESSION "Memory checker \\(MemoryCheckCommand\\) not set, or cannot find the specified program.")
 
+set(NORMAL_CTEST_OUTPUT "\n-- Processing memory checking output: \nMemory checking results:\n(BullseyeCoverage[^\n]*\n)?")
+
 # It is a valid result if valgrind does not output any files (can e.g. happen
 # if you have not compiled in debug mode), so these tests will not fail.
 set_tests_properties(CTestTestMemcheckDummyValgrind CTestTestMemcheckDummyValgrindPrePost
     PROPERTIES
-    PASS_REGULAR_EXPRESSION "\n-- Processing memory checking output: \nMemory checking results:\n$")
+    PASS_REGULAR_EXPRESSION "${NORMAL_CTEST_OUTPUT}")
 
 set_tests_properties(CTestTestMemcheckDummyValgrindFailPre
     PROPERTIES
@@ -66,7 +68,7 @@ set_tests_properties(CTestTestMemcheckDummyValgrindFailPost
 
 set_tests_properties(CTestTestMemcheckDummyValgrindIgnoreMemcheck
     PROPERTIES
-    PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain .*\n1/1 MemCheck #1: RunCMake .*\n-- Processing memory checking output: \nMemory checking results:\n$")
+    PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain .*\n1/1 MemCheck #1: RunCMake .*${NORMAL_CTEST_OUTPUT}")
 
 set_tests_properties(CTestTestMemcheckDummyPurify PROPERTIES
     PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CMAKE_CURRENT_BINARY_DIR}/DummyPurify/Testing/Temporary/MemoryChecker.log\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyPurify/test.cmake\n")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c453917fede3401286d336482637760387d7132
commit 4c453917fede3401286d336482637760387d7132
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Oct 2 20:37:07 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Oct 2 20:37:07 2012 +0200

    memcheck test: add workaround for Xcode bug

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index dd61a9b..99db8c0 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -5,6 +5,15 @@ endforeach ()
 # create binaries that we will use as a pseudo memory checker
 add_executable(pseudo_valgrind "${CMAKE_CURRENT_BINARY_DIR}/ret0.c")
 set_target_properties(pseudo_valgrind PROPERTIES OUTPUT_NAME valgrind)
+
+# Xcode 2.x forgets to create the output directory before linking
+# the individual architectures.
+if(CMAKE_OSX_ARCHITECTURES AND XCODE AND NOT "${XCODE_VERSION}" MATCHES "^[^12]")
+    add_custom_command(TARGET valgrind
+                       PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CFG_INTDIR}"
+    )
+endif()
+
 add_executable(pseudo_purify "${CMAKE_CURRENT_BINARY_DIR}/ret0.c")
 set_target_properties(pseudo_purify PROPERTIES OUTPUT_NAME purify)
 add_executable(pseudo_BC "${CMAKE_CURRENT_BINARY_DIR}/ret0.c")

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

Summary of changes:
 Tests/CTestTestMemcheck/CMakeLists.txt |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake