[Cmake-commits] CMake branch, next, updated. v3.2.2-2224-gcbdc3e4

[Stephen Kelly]

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  cbdc3e45f5ac59d2fbed3a0d56f16c59677c914d (commit)
       via  bf24b6c501f1f8c9146153038bb202ae246de7d0 (commit)
       via  dd062b2b50495b5cb9669efe13538fb032586722 (commit)
       via  5cdd4c4323e80036916b0916d3af32013bd6dc95 (commit)
       via  afc1f88c000ee173dc1aa9d5d8e8c7762e363713 (commit)
       via  1f305902be751cdae5bbadcb48f67cb723f9a09e (commit)
      from  6ae042cffd8dde1990c8bfeefa8e89da511dca97 (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=cbdc3e45f5ac59d2fbed3a0d56f16c59677c914d
commit cbdc3e45f5ac59d2fbed3a0d56f16c59677c914d
Merge: 6ae042c bf24b6c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 27 16:04:41 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 27 16:04:41 2015 -0400

    Merge topic 'deterministic-CTest-tests' into next
    
    bf24b6c5 Tests: Guard more CTest tests against parallel execution.
    dd062b2b CMake Nightly Date Stamp
    5cdd4c43 CMake Nightly Date Stamp
    afc1f88c CMake Nightly Date Stamp
    1f305902 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf24b6c501f1f8c9146153038bb202ae246de7d0
commit bf24b6c501f1f8c9146153038bb202ae246de7d0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 27 22:03:40 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Apr 27 22:03:40 2015 +0200

    Tests: Guard more CTest tests against parallel execution.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 0557035..32beffa 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2415,6 +2415,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   set_tests_properties(CTestCoverageCollectGCOV PROPERTIES
     PASS_REGULAR_EXPRESSION
     "PASSED with correct output.*Testing/CoverageInfo/main.cpp.gcov")
+  set_property(TEST CTestCoverageCollectGCOV PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
 
   configure_file(
     "${CMake_SOURCE_DIR}/Tests/CTestTestEmptyBinaryDirectory/test.cmake.in"
@@ -2714,6 +2715,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     )
   set_tests_properties(CTestTestSkipReturnCode PROPERTIES
     PASS_REGULAR_EXPRESSION "CMakeV1 \\.* +Passed.*CMakeV2 \\.+\\*+Skipped")
+  set_property(TEST CTestTestSkipReturnCode PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
 
   ADD_TEST_MACRO(CTestTestSerialInDepends ${CMAKE_CTEST_COMMAND} -j 4
     --output-on-failure -C "\${CTestTest_CONFIG}")
diff --git a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
index 6c96a26..5ad6511 100644
--- a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake
@@ -4,6 +4,8 @@ set(SITE test-site)
 set(BUILDNAME test-build)
 set(COVERAGE_COMMAND "")
 
+unset(ENV{CTEST_PARALLEL_LEVEL})
+
 function(run_mc_test CASE_NAME CHECKER_COMMAND)
   run_ctest(${CASE_NAME} ${ARGN})
 endfunction()

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

Summary of changes:
 Source/CMakeVersion.cmake                        |    2 +-
 Tests/CMakeLists.txt                             |    2 ++
 Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake |    2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake