[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-267-g546f866

[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  546f8660a617ccf9438ca3274fedbb8d38889f29 (commit)
       via  430251245e1d6bff24db128491d8c5b3e1bb8357 (commit)
      from  e6dc46b176601525b616a060ecf7e3f840555f3c (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=546f8660a617ccf9438ca3274fedbb8d38889f29
commit 546f8660a617ccf9438ca3274fedbb8d38889f29
Merge: e6dc46b 4302512
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 24 10:13:34 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 24 10:13:34 2016 -0500

    Merge topic 'test-cmake_parse_arguments' into next
    
    43025124 cmake_parse_arguments: Additional regression tests


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=430251245e1d6bff24db128491d8c5b3e1bb8357
commit 430251245e1d6bff24db128491d8c5b3e1bb8357
Author:     Dimitar Yordanov <dimitar.yordanov at sap.com>
AuthorDate: Sun Feb 21 19:38:16 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 24 10:07:30 2016 -0500

    cmake_parse_arguments: Additional regression tests
    
    Add regression tests for the arguments handling in
    cmake_parse_arguments. The tests were run also against cmake 3.4.1
    maint branch to verify that there are no regressions.
    
    Signed-off-by: Dimitar Yordanov <dimitar.yordanov at sap.com>
    Signed-off-by: Matthias Maennich <matthias.maennich at sap.com>

diff --git a/Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake b/Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake
index 72c82ab..028bfaf 100644
--- a/Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake
+++ b/Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake
@@ -29,6 +29,26 @@ macro(foo)
 endmacro()
 
 foo(FOO foo)
+TEST(_FOO1_FOO foo)
+TEST(_FOO2_FOO foo)
 
+# Make sure a list is split
+foo(FOO "foo;bar")
 TEST(_FOO1_FOO foo)
+TEST(_FOO1_UNPARSED_ARGUMENTS "bar")
 TEST(_FOO2_FOO foo)
+TEST(_FOO2_UNPARSED_ARGUMENTS "bar")
+
+# Do not split if argn is quoted
+foo(FOO "foo\\;bar")
+TEST(_FOO1_FOO foo)
+TEST(_FOO1_UNPARSED_ARGUMENTS "bar")
+TEST(_FOO2_FOO foo;bar)
+TEST(_FOO2_UNPARSED_ARGUMENTS "UNDEFINED")
+
+# Do not split if argn is quoted
+foo(FOO "foo\\\\;bar")
+TEST(_FOO1_FOO foo)
+TEST(_FOO1_UNPARSED_ARGUMENTS "bar")
+TEST(_FOO2_FOO foo;bar)
+TEST(_FOO2_UNPARSED_ARGUMENTS "UNDEFINED")
diff --git a/Tests/RunCMake/cmake_parse_arguments/Initialization.cmake b/Tests/RunCMake/cmake_parse_arguments/Initialization.cmake
index 462f923..b4199ea 100644
--- a/Tests/RunCMake/cmake_parse_arguments/Initialization.cmake
+++ b/Tests/RunCMake/cmake_parse_arguments/Initialization.cmake
@@ -25,6 +25,9 @@ TEST(pref_OPT1 TRUE)
 cmake_parse_arguments(pref "OPT1;OPT2" "" "" OPT1 OPT2)
 TEST(pref_OPT1 TRUE)
 TEST(pref_OPT2 TRUE)
+cmake_parse_arguments(pref "OPT1;OPT2" "" "" "OPT1;OPT2")
+TEST(pref_OPT1 TRUE)
+TEST(pref_OPT2 TRUE)
 cmake_parse_arguments(pref "OPT1;OPT2" "" "")
 TEST(pref_OPT1 FALSE)
 TEST(pref_OPT2 FALSE)
@@ -44,6 +47,9 @@ TEST(pref_SINGLE1 foo)
 cmake_parse_arguments(pref "" "SINGLE1;SINGLE2" "" SINGLE1 foo SINGLE2 bar)
 TEST(pref_SINGLE1 foo)
 TEST(pref_SINGLE2 bar)
+cmake_parse_arguments(pref "" "SINGLE1;SINGLE2" "" "SINGLE1;foo;SINGLE2;bar")
+TEST(pref_SINGLE1 foo)
+TEST(pref_SINGLE2 bar)
 cmake_parse_arguments(pref "" "SINGLE1;SINGLE2" "")
 TEST(pref_SINGLE1 UNDEFINED)
 TEST(pref_SINGLE2 UNDEFINED)
@@ -63,6 +69,9 @@ TEST(pref_MULTI1 foo)
 cmake_parse_arguments(pref "" "" "MULTI1;MULTI2" MULTI1 foo bar MULTI2 bar foo)
 TEST(pref_MULTI1 foo bar)
 TEST(pref_MULTI2 bar foo)
+cmake_parse_arguments(pref "" "" "MULTI1;MULTI2" "MULTI1;foo;bar;MULTI2;bar;foo")
+TEST(pref_MULTI1 foo bar)
+TEST(pref_MULTI2 bar foo)
 cmake_parse_arguments(pref "" "" "MULTI1;MULTI2")
 TEST(pref_MULTI1 UNDEFINED)
 TEST(pref_MULTI2 UNDEFINED)

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

Summary of changes:
 .../cmake_parse_arguments/CornerCases.cmake        |   20 ++++++++++++++++++++
 .../cmake_parse_arguments/Initialization.cmake     |    9 +++++++++
 2 files changed, 29 insertions(+)


hooks/post-receive
-- 
CMake