[Cmake-commits] CMake branch, next, updated. v3.4.0-1499-g9b40c5d

[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  9b40c5d41d8ab3cea48dc0387d6f2b237628c985 (commit)
       via  378185fb7f672113257502ef96cf7106c22dd39f (commit)
      from  c87c437dd7e2fe613026fe7efeb3472adbd288ec (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=9b40c5d41d8ab3cea48dc0387d6f2b237628c985
commit 9b40c5d41d8ab3cea48dc0387d6f2b237628c985
Merge: c87c437 378185f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 24 09:30:41 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 24 09:30:41 2015 -0500

    Merge topic 'test-cmake_policy-unmatched' into next
    
    378185fb Tests: Add case for unmatched cmake_policy({PUSH,POP})


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=378185fb7f672113257502ef96cf7106c22dd39f
commit 378185fb7f672113257502ef96cf7106c22dd39f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 24 09:12:58 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 24 09:30:16 2015 -0500

    Tests: Add case for unmatched cmake_policy({PUSH,POP})

diff --git a/Tests/RunCMake/PolicyScope/NotClosed-result.txt b/Tests/RunCMake/PolicyScope/NotClosed-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/PolicyScope/NotClosed-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/PolicyScope/NotClosed-stderr.txt b/Tests/RunCMake/PolicyScope/NotClosed-stderr.txt
new file mode 100644
index 0000000..293d161
--- /dev/null
+++ b/Tests/RunCMake/PolicyScope/NotClosed-stderr.txt
@@ -0,0 +1,4 @@
+^CMake Error at NotClosed.cmake:[0-9]+ \(include\):
+  cmake_policy PUSH without matching POP
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/PolicyScope/NotClosed.cmake b/Tests/RunCMake/PolicyScope/NotClosed.cmake
new file mode 100644
index 0000000..19b880e
--- /dev/null
+++ b/Tests/RunCMake/PolicyScope/NotClosed.cmake
@@ -0,0 +1 @@
+cmake_policy(PUSH)
diff --git a/Tests/RunCMake/PolicyScope/NotOpened-result.txt b/Tests/RunCMake/PolicyScope/NotOpened-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/PolicyScope/NotOpened-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/PolicyScope/NotOpened-stderr.txt b/Tests/RunCMake/PolicyScope/NotOpened-stderr.txt
new file mode 100644
index 0000000..f27aac8
--- /dev/null
+++ b/Tests/RunCMake/PolicyScope/NotOpened-stderr.txt
@@ -0,0 +1,4 @@
+^CMake Error at NotOpened.cmake:[0-9]+ \(cmake_policy\):
+  cmake_policy POP without matching PUSH
+Call Stack \(most recent call first\):
+  CMakeLists.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/PolicyScope/NotOpened.cmake b/Tests/RunCMake/PolicyScope/NotOpened.cmake
new file mode 100644
index 0000000..bb9f3a3
--- /dev/null
+++ b/Tests/RunCMake/PolicyScope/NotOpened.cmake
@@ -0,0 +1 @@
+cmake_policy(POP)
diff --git a/Tests/RunCMake/PolicyScope/RunCMakeTest.cmake b/Tests/RunCMake/PolicyScope/RunCMakeTest.cmake
index d6c021f..abd27f4 100644
--- a/Tests/RunCMake/PolicyScope/RunCMakeTest.cmake
+++ b/Tests/RunCMake/PolicyScope/RunCMakeTest.cmake
@@ -1,4 +1,6 @@
 include(RunCMake)
 
+run_cmake(NotClosed)
+run_cmake(NotOpened)
 run_cmake(parent-dir-generate-time)
 run_cmake(dir-in-macro-generate-time)

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

Summary of changes:
 .../CMP0004-NEW-result.txt => PolicyScope/NotClosed-result.txt}    |    0
 Tests/RunCMake/PolicyScope/NotClosed-stderr.txt                    |    4 ++++
 Tests/RunCMake/PolicyScope/NotClosed.cmake                         |    1 +
 .../CMP0004-NEW-result.txt => PolicyScope/NotOpened-result.txt}    |    0
 Tests/RunCMake/PolicyScope/NotOpened-stderr.txt                    |    4 ++++
 Tests/RunCMake/PolicyScope/NotOpened.cmake                         |    1 +
 Tests/RunCMake/PolicyScope/RunCMakeTest.cmake                      |    2 ++
 7 files changed, 12 insertions(+)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => PolicyScope/NotClosed-result.txt} (100%)
 create mode 100644 Tests/RunCMake/PolicyScope/NotClosed-stderr.txt
 create mode 100644 Tests/RunCMake/PolicyScope/NotClosed.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => PolicyScope/NotOpened-result.txt} (100%)
 create mode 100644 Tests/RunCMake/PolicyScope/NotOpened-stderr.txt
 create mode 100644 Tests/RunCMake/PolicyScope/NotOpened.cmake


hooks/post-receive
-- 
CMake