[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1134-gb033817

[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  b0338173a7374c328c7b10691da55d4ffa57fda5 (commit)
       via  6a56c8247fa874bd418c3e175c941070dafb0e76 (commit)
       via  5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0 (commit)
       via  8c13f0f7eaff8fd0404dbbc9a6eab5ee2637643b (commit)
      from  543db74ee695f2da558b1524a77850dd2d491fbd (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0338173a7374c328c7b10691da55d4ffa57fda5
commit b0338173a7374c328c7b10691da55d4ffa57fda5
Merge: 543db74 6a56c82
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 16:46:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 27 16:46:22 2015 -0400

    Merge topic 'fix-ctest_test-parallel-execution' into next
    
    6a56c824 Tests: Disable parallel test execution while running ctest_test
    5f14040c Tests: Don't overwrite RunCMake_TEST_FAILED variable
    8c13f0f7 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a56c8247fa874bd418c3e175c941070dafb0e76
commit 6a56c8247fa874bd418c3e175c941070dafb0e76
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 21:41:36 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:44:04 2015 +0100

    Tests: Disable parallel test execution while running ctest_test

diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index e2f380c..1b31726 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -71,6 +71,7 @@ add_test(NAME PassingTest COMMAND ${CMAKE_COMMAND} -E echo PassingTestOutput)
 add_test(NAME FailingTest COMMAND ${CMAKE_COMMAND} -E no_such_command)
   ]])
 
+  unset(ENV{CTEST_PARALLEL_LEVEL})
   run_ctest(TestOutputSize)
 endfunction()
 run_TestOutputSize()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0
commit 5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 21:41:31 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 21:42:24 2015 +0100

    Tests: Don't overwrite RunCMake_TEST_FAILED variable

diff --git a/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake b/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
index 918d242..74ad669 100644
--- a/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
+++ b/Tests/RunCMake/ctest_test/TestOutputSize-check.cmake
@@ -4,14 +4,14 @@ if(test_xml_file)
   if("${test_xml}" MATCHES [[(<Test Status="passed">.*</Test>).*(<Test Status="failed">.*</Test>)]])
     set(test_passed "${CMAKE_MATCH_1}")
     set(test_failed "${CMAKE_MATCH_2}")
+    if(NOT "${test_passed}" MATCHES [[<Value>PassingTes\.\.\..*10 bytes]])
+      set(RunCMake_TEST_FAILED "Test.xml passed test output not truncated at 10 bytes:\n ${test_passed}")
+    elseif(NOT "${test_failed}" MATCHES [[<Value>CMake Error:\.\.\..*12 bytes]])
+      set(RunCMake_TEST_FAILED "Test.xml failed test output not truncated at 12 bytes:\n ${test_failed}")
+    endif()
   else()
     set(RunCMake_TEST_FAILED "Test.xml does not contain a passed then failed test:\n ${test_xml}")
   endif()
-  if(NOT "${test_passed}" MATCHES [[<Value>PassingTes\.\.\..*10 bytes]])
-    set(RunCMake_TEST_FAILED "Test.xml passed test output not truncated at 10 bytes:\n ${test_passed}")
-  elseif(NOT "${test_failed}" MATCHES [[<Value>CMake Error:\.\.\..*12 bytes]])
-    set(RunCMake_TEST_FAILED "Test.xml failed test output not truncated at 12 bytes:\n ${test_failed}")
-  endif()
 else()
   set(RunCMake_TEST_FAILED "Test.xml not found")
 endif()

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

Summary of changes:
 Source/CMakeVersion.cmake                            |    2 +-
 Tests/RunCMake/ctest_test/RunCMakeTest.cmake         |    1 +
 Tests/RunCMake/ctest_test/TestOutputSize-check.cmake |   10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake