[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6218-g7c032c6

[Nils Gladitz]

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  7c032c6675d5054679cc1fb6d5db6b9d9b6d219c (commit)
       via  57c008c37a575f379b15b8cdd929663bd12a4365 (commit)
       via  c9ca4a7142adf93fd18fad202732d4d691625fda (commit)
       via  5e43d6d3d0285901af816ab1ed37563ea00eaf21 (commit)
       via  edaef237bf90b5e6af095883370d0f490d13c844 (commit)
      from  2acbca625ebb30a00c31d30f425a3cc2ab23a1fa (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=7c032c6675d5054679cc1fb6d5db6b9d9b6d219c
commit 7c032c6675d5054679cc1fb6d5db6b9d9b6d219c
Merge: 2acbca6 57c008c
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Dec 14 18:37:15 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Dec 14 18:37:15 2013 -0500

    Merge topic 'build-symlink-invalid-sup-file' into next
    
    57c008c Tests: allow valgrind test to pass with symlinked build dir
    c9ca4a7 CMake Nightly Date Stamp
    5e43d6d CMake Nightly Date Stamp
    edaef23 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57c008c37a575f379b15b8cdd929663bd12a4365
commit 57c008c37a575f379b15b8cdd929663bd12a4365
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sun Dec 15 00:31:14 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Sun Dec 15 00:31:14 2013 +0100

    Tests: allow valgrind test to pass with symlinked build dir

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index b5162c9..9bd7249 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -1,5 +1,13 @@
 REGEX_ESCAPE_STRING(CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 
+get_filename_component(CTEST_REALPATH_CMAKE_CURRENT_BINARY_DIR
+  "${CMAKE_CURRENT_BINARY_DIR}" REALPATH
+)
+
+REGEX_ESCAPE_STRING(CTEST_ESCAPED_REALPATH_CMAKE_CURRENT_BINARY_DIR
+  "${CTEST_REALPATH_CMAKE_CURRENT_BINARY_DIR}"
+)
+
 foreach (_retval 0 1)
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/memtester.cxx.in" "${CMAKE_CURRENT_BINARY_DIR}/ret${_retval}.cxx" @ONLY)
 endforeach ()
@@ -180,7 +188,7 @@ set_tests_properties(CTestTestMemcheckDummyBC PROPERTIES
     PASS_REGULAR_EXPRESSION "\n1/1 MemCheck #1: RunCMake \\.+   Passed +[0-9]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n(.*\n)?Error parsing XML in stream at line 1: no element found\n")
 
 set_tests_properties(CTestTestMemcheckDummyValgrindInvalidSupFile PROPERTIES
-    PASS_REGULAR_EXPRESSION "\nCannot find memory checker suppression file: ${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/does-not-exist\n")
+    PASS_REGULAR_EXPRESSION "\nCannot find memory checker suppression file: ${CTEST_ESCAPED_REALPATH_CMAKE_CURRENT_BINARY_DIR}/does-not-exist\n")
 
 set_tests_properties(CTestTestMemcheckDummyValgrindCustomOptions PROPERTIES
     PASS_REGULAR_EXPRESSION "\nCannot find memory tester output file: ${CTEST_ESCAPED_CMAKE_CURRENT_BINARY_DIR}/DummyValgrindCustomOptions/Testing/Temporary/MemoryChecker.1.log\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/DummyValgrindCustomOptions/test.cmake\n")

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

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


hooks/post-receive
-- 
CMake