[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2905-g894e00b

[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  894e00bded28af3e7ca3eb14c283d4e77253a9bd (commit)
       via  5a768f7f169e49b76c33fa5210297ce5f79aed70 (commit)
       via  00a30386cfe2e1a9cb842db17505b3baf07e119c (commit)
      from  1a9b54a17d52bed00d546ddfaab68b4b50d5c028 (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=894e00bded28af3e7ca3eb14c283d4e77253a9bd
commit 894e00bded28af3e7ca3eb14c283d4e77253a9bd
Merge: 1a9b54a 5a768f7
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed May 8 09:09:37 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 8 09:09:37 2013 -0400

    Merge topic 'MemChecker-improvements' into next
    
    5a768f7 tests: try to fix test failures due to stale files
    00a3038 tests: remove useless 2nd subtest from DummyValgrindInvalidSupFile


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a768f7f169e49b76c33fa5210297ce5f79aed70
commit 5a768f7f169e49b76c33fa5210297ce5f79aed70
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed May 8 15:06:20 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed May 8 15:06:20 2013 +0200

    tests: try to fix test failures due to stale files
    
    These tests have the same binary directory as always. But until yesterday they
    had a source directory in the source tree, now their source and binary
    directory are the same and the CMakeLists.txt is written into them using
    configure_file(). Wipe these directories before writing the configuration to
    avoid errors because of stale files.

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 3e5a405..a6813ee 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -37,6 +37,10 @@ set(NORMAL_CTEST_OUTPUT "\n1/1 MemCheck #1: RunCMake \\.+   Passed +[0-0]+.[0-9]
 set(BULLSEYE_MSG "(BullseyeCoverage[^\n]*\n)?")
 
 function(gen_mc_test_internal NAME CHECKER)
+    # just to clean old directories from the time these had real source dirs
+    file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/${NAME}")
+    # end
+
     set(SUBTEST_NAME "${NAME}")
     set(CHECKER_COMMAND "${CHECKER}")
     foreach(_file IN ITEMS CMakeLists.txt CTestConfig.cmake test.cmake)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00a30386cfe2e1a9cb842db17505b3baf07e119c
commit 00a30386cfe2e1a9cb842db17505b3baf07e119c
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed May 8 15:04:19 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed May 8 15:04:19 2013 +0200

    tests: remove useless 2nd subtest from DummyValgrindInvalidSupFile

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 374b25f..3e5a405 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -98,10 +98,10 @@ set(CMAKELISTS_EXTRA_CODE "add_test(NAME RunCMakeAgain COMMAND \"\${CMAKE_COMMAN
 gen_mc_test(DummyValgrindIgnoreMemcheck "\${PSEUDO_VALGRIND}")
 
 set(CTEST_EXTRA_CONFIG "set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE \"\${CMAKE_CURRENT_BINARY_DIR}/does-not-exist\")")
+unset(CMAKELISTS_EXTRA_CODE)
 gen_mc_test(DummyValgrindInvalidSupFile "\${PSEUDO_VALGRIND}")
 
 unset(CTEST_EXTRA_CONFIG)
-unset(CMAKELISTS_EXTRA_CODE)
 gen_mc_test(NotExist "\${CTEST_BINARY_DIRECTORY}/no-memcheck-exe")
 
 gen_mc_test(Unknown "${CMAKE_COMMAND}")

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

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


hooks/post-receive
-- 
CMake