[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1022-g7b53ae4

[Ben Boeckel]

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  7b53ae4cda37d9df6f9653e8203da610be1ea4a7 (commit)
       via  c9a46aa4a57580841525a231a37ef47c49374491 (commit)
      from  f877254b91e3a02544999020cd64baa6db8e7e56 (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=7b53ae4cda37d9df6f9653e8203da610be1ea4a7
commit 7b53ae4cda37d9df6f9653e8203da610be1ea4a7
Merge: f877254 c9a46aa
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Dec 2 13:50:58 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 2 13:50:58 2014 -0500

    Merge topic 'cached-regex-clear-fixed' into next
    
    c9a46aa4 fixup! test: add a test for clearing regex results


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9a46aa4a57580841525a231a37ef47c49374491
commit c9a46aa4a57580841525a231a37ef47c49374491
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Dec 2 13:50:49 2014 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Dec 2 13:50:49 2014 -0500

    fixup! test: add a test for clearing regex results

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 6ed3f0a..c9d9568 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -271,7 +271,6 @@ if(BUILD_TESTING)
   ADD_TEST_MACRO(MacroTest miniMacroTest)
   ADD_TEST_MACRO(FunctionTest miniFunctionTest)
   ADD_TEST_MACRO(ReturnTest ReturnTest)
-  ADD_TEST_MACRO(RegexClear RegexClear)
   ADD_TEST_MACRO(Properties Properties)
   ADD_TEST_MACRO(Assembler HelloAsm)
   ADD_TEST_MACRO(SourceGroups SourceGroups)
diff --git a/Tests/RunCMake/string/RegexClear-stderr.txt b/Tests/RunCMake/string/RegexClear-stderr.txt
new file mode 100644
index 0000000..22b0159
--- /dev/null
+++ b/Tests/RunCMake/string/RegexClear-stderr.txt
@@ -0,0 +1,54 @@
+^Matched string properly
+results from: setting up initial state
+CMAKE_MATCH_0: -->01<--
+CMAKE_MATCH_1: -->0<--
+CMAKE_MATCH_2: -->1<--
+CMAKE_MATCH_COUNT: -->2<--
+Matched string properly
+results from: making a match inside of find_package
+CMAKE_MATCH_0: -->01<--
+CMAKE_MATCH_1: -->0<--
+CMAKE_MATCH_2: -->1<--
+CMAKE_MATCH_COUNT: -->2<--
+Matched nothing properly
+results from: making a failure inside of find_package
+CMAKE_MATCH_0: --><--
+CMAKE_MATCH_1: --><--
+CMAKE_MATCH_2: --><--
+CMAKE_MATCH_COUNT: -->0<--
+Matched nothing properly
+results from: checking after find_package
+CMAKE_MATCH_0: --><--
+CMAKE_MATCH_1: --><--
+CMAKE_MATCH_2: --><--
+CMAKE_MATCH_COUNT: -->0<--
+Matched nothing properly
+results from: clearing out results with a failing match
+CMAKE_MATCH_0: --><--
+CMAKE_MATCH_1: --><--
+CMAKE_MATCH_2: --><--
+CMAKE_MATCH_COUNT: -->0<--
+Matched string properly
+results from: making a successful match before add_subdirectory
+CMAKE_MATCH_0: -->01<--
+CMAKE_MATCH_1: -->0<--
+CMAKE_MATCH_2: -->1<--
+CMAKE_MATCH_COUNT: -->2<--
+Matched string properly
+results from: check for success in add_subdirectory
+CMAKE_MATCH_0: -->01<--
+CMAKE_MATCH_1: -->0<--
+CMAKE_MATCH_2: -->1<--
+CMAKE_MATCH_COUNT: -->2<--
+Matched nothing properly
+results from: failing inside of add_subdirectory
+CMAKE_MATCH_0: --><--
+CMAKE_MATCH_1: --><--
+CMAKE_MATCH_2: --><--
+CMAKE_MATCH_COUNT: -->0<--
+Matched string properly
+results from: ensuring the subdirectory did not interfere with the parent
+CMAKE_MATCH_0: -->01<--
+CMAKE_MATCH_1: -->0<--
+CMAKE_MATCH_2: -->1<--
+CMAKE_MATCH_COUNT: -->2<--$

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

Summary of changes:
 Tests/CMakeLists.txt                        |    1 -
 Tests/RunCMake/string/RegexClear-stderr.txt |   54 +++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 Tests/RunCMake/string/RegexClear-stderr.txt


hooks/post-receive
-- 
CMake