[Cmake-commits] CMake branch, next, updated. v3.1.0-1302-g64972ed

[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  64972eddc8caf4663356ae20ad25bb8cc9987147 (commit)
       via  d4d491ef4c49ce84872f5e7039852de4bdc0628c (commit)
      from  7e07fc027b8d409a501514a39d0df2c0d11adfd0 (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=64972eddc8caf4663356ae20ad25bb8cc9987147
commit 64972eddc8caf4663356ae20ad25bb8cc9987147
Merge: 7e07fc0 d4d491e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Dec 20 09:41:44 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Dec 20 09:41:44 2014 -0500

    Merge topic 'RunCMake-stderr-default' into next
    
    d4d491ef Revert "RunCMake: Expect empty output by default."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4d491ef4c49ce84872f5e7039852de4bdc0628c
commit d4d491ef4c49ce84872f5e7039852de4bdc0628c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Dec 20 15:41:19 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Dec 20 15:41:19 2014 +0100

    Revert "RunCMake: Expect empty output by default."
    
    This reverts commit c41a1f322510eeb486db73a37d115f4162761ce5.

diff --git a/Tests/RunCMake/CMP0019/CMakeLists.txt b/Tests/RunCMake/CMP0019/CMakeLists.txt
index 8f85fbf..12cd3c7 100644
--- a/Tests/RunCMake/CMP0019/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0019/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 2.8.4)
 project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 0c43c20..84e3614 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -37,9 +37,7 @@ run_cmake_command(E_env-bad-arg1 ${CMAKE_COMMAND} -E env -bad-arg1)
 run_cmake_command(E_env-set   ${CMAKE_COMMAND} -E env TEST_ENV=1 ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/E_env-set.cmake)
 run_cmake_command(E_env-unset ${CMAKE_COMMAND} -E env TEST_ENV=1 ${CMAKE_COMMAND} -E env --unset=TEST_ENV ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/E_env-unset.cmake)
 
-set(RunCMake_DEFAULT_stderr ".")
 run_cmake_command(E_sleep-no-args ${CMAKE_COMMAND} -E sleep)
-unset(RunCMake_DEFAULT_stderr)
 run_cmake_command(E_sleep-bad-arg1 ${CMAKE_COMMAND} -E sleep x)
 run_cmake_command(E_sleep-bad-arg2 ${CMAKE_COMMAND} -E sleep 1 -1)
 run_cmake_command(E_sleep-one-tenth ${CMAKE_COMMAND} -E sleep 0.1)
diff --git a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
index e9b2a7a..bb7743c 100644
--- a/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
+++ b/Tests/RunCMake/FPHSA/RunCMakeTest.cmake
@@ -14,7 +14,6 @@ run_cmake(exact_1.2.3)
 run_cmake(exact_1.2.3.4)
 
 # now test every component with an invalid version
-set(RunCMake_DEFAULT_stderr ".")
 run_cmake(exact_0)
 run_cmake(exact_2)
 run_cmake(exact_1.1)
@@ -23,7 +22,6 @@ run_cmake(exact_1.2.2)
 run_cmake(exact_1.2.4)
 run_cmake(exact_1.2.3.3)
 run_cmake(exact_1.2.3.5)
-unset(RunCMake_DEFAULT_stderr)
 
 # check if searching for a version 0 works
 list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DPseudo_VERSION=0")
diff --git a/Tests/RunCMake/README.rst b/Tests/RunCMake/README.rst
index e801a86..536cff2 100644
--- a/Tests/RunCMake/README.rst
+++ b/Tests/RunCMake/README.rst
@@ -41,7 +41,7 @@ but do not actually build anything.  To add a test:
    ``<SubTest>-stdout.txt``
     Regex matching expected stdout content
    ``<SubTest>-stderr.txt``
-    Regex matching expected stderr content, if not "^$"
+    Regex matching expected stderr content
    ``<SubTest>-check.cmake``
     Custom result check.
 
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 7b3eda7..7b1a5b2 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -25,13 +25,6 @@ function(run_cmake test)
       unset(expect_std${o})
     endif()
   endforeach()
-  if (NOT expect_stderr)
-    if (NOT RunCMake_DEFAULT_stderr)
-      set(RunCMake_DEFAULT_stderr "^$")
-    endif()
-    set(expect_stderr ${RunCMake_DEFAULT_stderr})
-  endif()
-
   if (NOT RunCMake_TEST_SOURCE_DIR)
     set(RunCMake_TEST_SOURCE_DIR "${top_src}")
   endif()

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

Summary of changes:
 Tests/RunCMake/CMP0019/CMakeLists.txt         |    2 +-
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake |    2 --
 Tests/RunCMake/FPHSA/RunCMakeTest.cmake       |    2 --
 Tests/RunCMake/README.rst                     |    2 +-
 Tests/RunCMake/RunCMake.cmake                 |    7 -------
 5 files changed, 2 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake