[Cmake-commits] CMake branch, next, updated. v3.2.2-1994-g83597d4

[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  83597d46b404fbb57496466d1f05013836eb7da8 (commit)
       via  fcf9cf6cd8a8299100c571afbacc134932552bb6 (commit)
      from  fba9de3c35c554d87d20d10d7bd44404e55f46a9 (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=83597d46b404fbb57496466d1f05013836eb7da8
commit 83597d46b404fbb57496466d1f05013836eb7da8
Merge: fba9de3 fcf9cf6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 20 18:31:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 20 18:31:52 2015 -0400

    Merge topic 'deterministic-CTest-tests' into next
    
    fcf9cf6c Tests: Make a CTest test deterministic.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcf9cf6cd8a8299100c571afbacc134932552bb6
commit fcf9cf6cd8a8299100c571afbacc134932552bb6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Apr 19 22:17:44 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Apr 21 00:31:02 2015 +0200

    Tests: Make a CTest test deterministic.
    
    The test expect sub-test not to run in parallel.

diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index 2e5156c..22a8d20 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -1,5 +1,8 @@
 include(RunCMake)
 
+unset(ENV{CTEST_PARALLEL_LEVEL})
+unset(ENV{CTEST_OUTPUT_ON_FAILURE})
+
 run_cmake_command(repeat-until-fail-bad1
   ${CMAKE_CTEST_COMMAND} --repeat-until-fail
   )

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

Summary of changes:
 Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake