[Cmake-commits] CMake branch, next, updated. v3.2.2-2025-gf7bbc99

[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  f7bbc99cf5ddc2754d7ff706c621c207957f903e (commit)
       via  2f4b13b32d100b755ff6b4a61cdd0d85a99e6ebb (commit)
      from  5fe0bfada47c3c5e7b27556ffd6b449896540133 (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=f7bbc99cf5ddc2754d7ff706c621c207957f903e
commit f7bbc99cf5ddc2754d7ff706c621c207957f903e
Merge: 5fe0bfa 2f4b13b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 21 11:48:37 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 21 11:48:37 2015 -0400

    Merge topic 'fix-CTestTestSerialOrder-parallel-env' into next
    
    2f4b13b3 Tests: Protect CTestTestSerialOrder from environment (#15524)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f4b13b32d100b755ff6b4a61cdd0d85a99e6ebb
commit 2f4b13b32d100b755ff6b4a61cdd0d85a99e6ebb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 21 11:46:18 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 21 11:47:42 2015 -0400

    Tests: Protect CTestTestSerialOrder from environment (#15524)
    
    Reported-by: Stephen Kelly <steveire at gmail.com>

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 699b616..d568a64 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2680,6 +2680,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
 
   ADD_TEST_MACRO(CTestTestSerialOrder ${CMAKE_CTEST_COMMAND}
     --output-on-failure -C "\${CTestTest_CONFIG}")
+  set_property(TEST CTestTestSerialOrder PROPERTY ENVIRONMENT CTEST_PARALLEL_LEVEL=)
 
   if(NOT BORLAND)
     set(CTestLimitDashJ_CTEST_OPTIONS --force-new-ctest-process)

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

Summary of changes:
 Tests/CMakeLists.txt |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake