[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1309-g973587f

[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  973587f5d9a4575124136d4b36d13ba757989b7e (commit)
       via  32b5df2b007705df8fad2a5546e19668516e335e (commit)
       via  c7a3fc0e3d02175c49c9f73d4c28cfb330c4f5f9 (commit)
      from  6411037555f1bf7141671d5d8893dd6a3db7643b (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=973587f5d9a4575124136d4b36d13ba757989b7e
commit 973587f5d9a4575124136d4b36d13ba757989b7e
Merge: 6411037 32b5df2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 23 10:07:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 23 10:07:08 2015 -0400

    Merge topic 'update-kwsys' into next
    
    32b5df2b Tests: In CTestTest2 skip the kwsys.testProcess-10 test that leaks
    c7a3fc0e CTestCustom: Ignore kwsys.testProcess-10 for MemCheck as KWSys does


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32b5df2b007705df8fad2a5546e19668516e335e
commit 32b5df2b007705df8fad2a5546e19668516e335e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 23 09:47:03 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 23 10:03:12 2015 -0400

    Tests: In CTestTest2 skip the kwsys.testProcess-10 test that leaks
    
    This test intentionally leaks memory so KWSys excludes it from MemCheck.
    However, when CTestTest2 runs under our own MemCheck then valgrind may
    recursively check tests run by ctest_test() calls in our test.cmake
    script.  Teach these calls to exluce testProcess-10 too.  Also read
    the KWSys CTestCustom.cmake file so ctest_memcheck() will ignore the
    test too.

diff --git a/Tests/CTestTest2/test.cmake.in b/Tests/CTestTest2/test.cmake.in
index 852bb6b..825b957 100644
--- a/Tests/CTestTest2/test.cmake.in
+++ b/Tests/CTestTest2/test.cmake.in
@@ -39,14 +39,19 @@ CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
 CTEST_TEST_KWSYS:BOOL=ON
 ")
 
+set(test_exclude
+  kwsys.testProcess-10
+  )
+
 CTEST_START(Experimental)
 #CTEST_UPDATE(SOURCE "${CTEST_SOURCE_DIRECTORY}" RETURN_VALUE res)
 CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+CTEST_READ_CUSTOM_FILES(${CTEST_BINARY_DIRECTORY})
 CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res START 1 END 5 STRIDE 2)
-CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res START 7 STRIDE 2 SUBMIT_INDEX 1)
-CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res START 2 END 4 STRIDE 2 SUBMIT_INDEX 2)
-CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res START 6 STRIDE 2 SUBMIT_INDEX 3)
+CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res EXCLUDE ${test_exclude} START 1 END 5 STRIDE 2)
+CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res EXCLUDE ${test_exclude} START 7 STRIDE 2 SUBMIT_INDEX 1)
+CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res EXCLUDE ${test_exclude} START 2 END 4 STRIDE 2 SUBMIT_INDEX 2)
+CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res EXCLUDE ${test_exclude} START 6 STRIDE 2 SUBMIT_INDEX 3)
 CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res STRIDE 1.5)
 CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7a3fc0e3d02175c49c9f73d4c28cfb330c4f5f9
commit c7a3fc0e3d02175c49c9f73d4c28cfb330c4f5f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 23 09:22:25 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 23 09:33:46 2015 -0400

    CTestCustom: Ignore kwsys.testProcess-10 for MemCheck as KWSys does
    
    The test covers exceptional behavior that leaks memory, so ignore it for
    dynamic analysis runs.

diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index 7f20d10..f29ac70 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -109,3 +109,7 @@ set(CTEST_CUSTOM_COVERAGE_EXCLUDE
   # Exclude Qt source files from coverage results:
   "[A-Za-z]./[Qq]t/qt-.+-opensource-src"
   )
+
+list(APPEND CTEST_CUSTOM_MEMCHECK_IGNORE
+  kwsys.testProcess-10 # See Source/kwsys/CTestCustom.cmake.in
+  )

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

Summary of changes:
 CTestCustom.cmake.in           |    4 ++++
 Tests/CTestTest2/test.cmake.in |   13 +++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake