[Cmake-commits] CMake branch, master, updated. v3.10.0-rc5-344-gd261704

Kitware Robot kwrobot at kitware.com
Fri Nov 17 10:15:36 EST 2017


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, master has been updated
       via  d261704ef529b420ac04335364344a91b4c9d95f (commit)
       via  fb114a40aa29c73c067a357d843cd12e187e95dc (commit)
      from  8e6d6337cdfa62dd5412057c6dcb6d7c23709f6e (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=d261704ef529b420ac04335364344a91b4c9d95f
commit d261704ef529b420ac04335364344a91b4c9d95f
Merge: 8e6d633 fb114a4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 17 15:13:50 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 17 10:14:03 2017 -0500

    Merge topic 'test-bad-foreach-in-function'
    
    fb114a40 Tests: Add test for bad foreach inside a function
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1492


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb114a40aa29c73c067a357d843cd12e187e95dc
commit fb114a40aa29c73c067a357d843cd12e187e95dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 16 11:06:11 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 16 11:10:05 2017 -0500

    Tests: Add test for bad foreach inside a function
    
    Add test for a case fixed by commit 6a4a61d9e1 (cmForEachCommand:
    prevent leakage, 2017-10-09).  Prior to that fix, this test case
    could trigger an assertion failure.
    
    Fixes: #17464

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 5d584af..6b7b723 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -218,6 +218,7 @@ add_RunCMake_test(find_library)
 add_RunCMake_test(find_package)
 add_RunCMake_test(find_path)
 add_RunCMake_test(find_program -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME})
+add_RunCMake_test(foreach)
 add_RunCMake_test(get_filename_component)
 add_RunCMake_test(get_property)
 add_RunCMake_test(if)
diff --git a/Tests/RunCMake/foreach/BadRangeInFunction-result.txt b/Tests/RunCMake/foreach/BadRangeInFunction-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/foreach/BadRangeInFunction-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/foreach/BadRangeInFunction-stderr.txt b/Tests/RunCMake/foreach/BadRangeInFunction-stderr.txt
new file mode 100644
index 0000000..e16a0f1
--- /dev/null
+++ b/Tests/RunCMake/foreach/BadRangeInFunction-stderr.txt
@@ -0,0 +1,5 @@
+^CMake Error at BadRangeInFunction.cmake:2 \(foreach\):
+  foreach called with incorrect range specification: start 2, stop 1, step 1
+Call Stack \(most recent call first\):
+  BadRangeInFunction.cmake:5 \(func\)
+  CMakeLists.txt:3 \(include\)$
diff --git a/Tests/RunCMake/foreach/BadRangeInFunction.cmake b/Tests/RunCMake/foreach/BadRangeInFunction.cmake
new file mode 100644
index 0000000..f51cbbf
--- /dev/null
+++ b/Tests/RunCMake/foreach/BadRangeInFunction.cmake
@@ -0,0 +1,5 @@
+function(func)
+  foreach(bad_range RANGE 2 1 1)
+  endforeach()
+endfunction()
+func()
diff --git a/Tests/RunCMake/foreach/CMakeLists.txt b/Tests/RunCMake/foreach/CMakeLists.txt
new file mode 100644
index 0000000..bf2ef15
--- /dev/null
+++ b/Tests/RunCMake/foreach/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.10)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/foreach/RunCMakeTest.cmake b/Tests/RunCMake/foreach/RunCMakeTest.cmake
new file mode 100644
index 0000000..4b74cfe
--- /dev/null
+++ b/Tests/RunCMake/foreach/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(BadRangeInFunction)

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                                     |    1 +
 .../BadRangeInFunction-result.txt}                                |    0
 Tests/RunCMake/foreach/BadRangeInFunction-stderr.txt              |    5 +++++
 Tests/RunCMake/foreach/BadRangeInFunction.cmake                   |    5 +++++
 Tests/RunCMake/{MultiLint => foreach}/CMakeLists.txt              |    0
 Tests/RunCMake/foreach/RunCMakeTest.cmake                         |    3 +++
 6 files changed, 14 insertions(+)
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => foreach/BadRangeInFunction-result.txt} (100%)
 create mode 100644 Tests/RunCMake/foreach/BadRangeInFunction-stderr.txt
 create mode 100644 Tests/RunCMake/foreach/BadRangeInFunction.cmake
 copy Tests/RunCMake/{MultiLint => foreach}/CMakeLists.txt (100%)
 create mode 100644 Tests/RunCMake/foreach/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list