[Cmake-commits] CMake branch, next, updated. v2.8.9-864-g613c492
Rolf Eike Beer
eike at sf-mail.de
Sat Sep 29 08:18:14 EDT 2012
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 613c4929175b5122ab0792582d04d2c9d1a0b188 (commit)
via baa726f82ac3240a1ffecda002da3f7e97dcb955 (commit)
via 8956b7e887a9d4860148997fccd8e08ea7fcb2f3 (commit)
from 4a3a376fcdc12347b01566302bce3594b7ca2090 (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=613c4929175b5122ab0792582d04d2c9d1a0b188
commit 613c4929175b5122ab0792582d04d2c9d1a0b188
Merge: 4a3a376 baa726f
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Sep 29 08:18:13 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 29 08:18:13 2012 -0400
Merge topic 'start-contributing-irc-session' into next
baa726f Add tests for list() argument count
8956b7e CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=baa726f82ac3240a1ffecda002da3f7e97dcb955
commit baa726f82ac3240a1ffecda002da3f7e97dcb955
Author: Petr Kmoch <petr.kmoch at gmail.com>
AuthorDate: Sat Sep 29 13:02:38 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Sep 29 14:16:59 2012 +0200
Add tests for list() argument count
Add test for error reporting when list() subcommands have wrong number of
arguments.
diff --git a/Tests/CMakeTests/List-Append-No-Arguments.cmake b/Tests/CMakeTests/List-Append-No-Arguments.cmake
new file mode 100644
index 0000000..dff6b09
--- /dev/null
+++ b/Tests/CMakeTests/List-Append-No-Arguments.cmake
@@ -0,0 +1 @@
+list(APPEND)
diff --git a/Tests/CMakeTests/List-Find-No-Arguments.cmake b/Tests/CMakeTests/List-Find-No-Arguments.cmake
new file mode 100644
index 0000000..c170092
--- /dev/null
+++ b/Tests/CMakeTests/List-Find-No-Arguments.cmake
@@ -0,0 +1 @@
+list(FIND)
diff --git a/Tests/CMakeTests/List-Get-No-Arguments.cmake b/Tests/CMakeTests/List-Get-No-Arguments.cmake
new file mode 100644
index 0000000..e8af86c
--- /dev/null
+++ b/Tests/CMakeTests/List-Get-No-Arguments.cmake
@@ -0,0 +1 @@
+list(GET)
diff --git a/Tests/CMakeTests/List-Insert-No-Arguments.cmake b/Tests/CMakeTests/List-Insert-No-Arguments.cmake
new file mode 100644
index 0000000..4eefe45
--- /dev/null
+++ b/Tests/CMakeTests/List-Insert-No-Arguments.cmake
@@ -0,0 +1 @@
+list(INSERT)
diff --git a/Tests/CMakeTests/List-Length-Too-Many-Arguments.cmake b/Tests/CMakeTests/List-Length-Too-Many-Arguments.cmake
new file mode 100644
index 0000000..327db6a
--- /dev/null
+++ b/Tests/CMakeTests/List-Length-Too-Many-Arguments.cmake
@@ -0,0 +1 @@
+list(LENGTH mylist result one_too_many)
diff --git a/Tests/CMakeTests/List-No-Arguments.cmake b/Tests/CMakeTests/List-No-Arguments.cmake
new file mode 100644
index 0000000..7916aaa
--- /dev/null
+++ b/Tests/CMakeTests/List-No-Arguments.cmake
@@ -0,0 +1 @@
+list()
diff --git a/Tests/CMakeTests/List-Remove_At-No-Arguments.cmake b/Tests/CMakeTests/List-Remove_At-No-Arguments.cmake
new file mode 100644
index 0000000..836c7a6
--- /dev/null
+++ b/Tests/CMakeTests/List-Remove_At-No-Arguments.cmake
@@ -0,0 +1 @@
+list(REMOVE_AT)
diff --git a/Tests/CMakeTests/List-Remove_Duplicates-No-Arguments.cmake b/Tests/CMakeTests/List-Remove_Duplicates-No-Arguments.cmake
new file mode 100644
index 0000000..317d0c6
--- /dev/null
+++ b/Tests/CMakeTests/List-Remove_Duplicates-No-Arguments.cmake
@@ -0,0 +1 @@
+list(REMOVE_DUPLICATES)
diff --git a/Tests/CMakeTests/List-Remove_Duplicates-Too-Many-Arguments.cmake b/Tests/CMakeTests/List-Remove_Duplicates-Too-Many-Arguments.cmake
new file mode 100644
index 0000000..b5eb46e
--- /dev/null
+++ b/Tests/CMakeTests/List-Remove_Duplicates-Too-Many-Arguments.cmake
@@ -0,0 +1 @@
+list(REMOVE_DUPLICATES mylist one_too_many)
diff --git a/Tests/CMakeTests/List-Remove_Item-No-Arguments.cmake b/Tests/CMakeTests/List-Remove_Item-No-Arguments.cmake
new file mode 100644
index 0000000..d1329ad
--- /dev/null
+++ b/Tests/CMakeTests/List-Remove_Item-No-Arguments.cmake
@@ -0,0 +1 @@
+list(REMOVE_ITEM)
diff --git a/Tests/CMakeTests/List-Reverse-No-Arguments.cmake b/Tests/CMakeTests/List-Reverse-No-Arguments.cmake
new file mode 100644
index 0000000..3940f6b
--- /dev/null
+++ b/Tests/CMakeTests/List-Reverse-No-Arguments.cmake
@@ -0,0 +1 @@
+list(REVERSE)
diff --git a/Tests/CMakeTests/List-Reverse-Too-Many-Arguments.cmake b/Tests/CMakeTests/List-Reverse-Too-Many-Arguments.cmake
new file mode 100644
index 0000000..3a554a0
--- /dev/null
+++ b/Tests/CMakeTests/List-Reverse-Too-Many-Arguments.cmake
@@ -0,0 +1 @@
+list(REVERSE mylist one_too_many)
diff --git a/Tests/CMakeTests/List-Sort-No-Arguments.cmake b/Tests/CMakeTests/List-Sort-No-Arguments.cmake
new file mode 100644
index 0000000..627cc49
--- /dev/null
+++ b/Tests/CMakeTests/List-Sort-No-Arguments.cmake
@@ -0,0 +1 @@
+list(SORT)
diff --git a/Tests/CMakeTests/List-Sort-Too-Many-Arguments.cmake b/Tests/CMakeTests/List-Sort-Too-Many-Arguments.cmake
new file mode 100644
index 0000000..81b195d
--- /dev/null
+++ b/Tests/CMakeTests/List-Sort-Too-Many-Arguments.cmake
@@ -0,0 +1 @@
+list(SORT mylist one_too_many)
diff --git a/Tests/CMakeTests/ListTest.cmake.in b/Tests/CMakeTests/ListTest.cmake.in
index a167503..ccc597c 100644
--- a/Tests/CMakeTests/ListTest.cmake.in
+++ b/Tests/CMakeTests/ListTest.cmake.in
@@ -97,3 +97,63 @@ TEST("REVERSE empty result" "")
list(SORT result)
TEST("SORT empty result" "")
+
+set(No-Arguments-RESULT 1)
+set(No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-No-Arguments.cmake:1 \\(list\\):.*list must be called with at least one argument.*")
+
+set(Length-Too-Many-Arguments-RESULT 1)
+set(Length-Too-Many-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Length-Too-Many-Arguments.cmake:1 \\(list\\):.*list sub-command LENGTH requires two arguments.*")
+
+set(Get-No-Arguments-RESULT 1)
+set(Get-No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Get-No-Arguments.cmake:1 \\(list\\):.*list sub-command GET requires at least three arguments.*")
+
+set(Append-No-Arguments-RESULT 1)
+set(Append-No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Append-No-Arguments.cmake:1 \\(list\\):.*list sub-command APPEND requires at least one argument.*")
+
+set(Find-No-Arguments-RESULT 1)
+set(Find-No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Find-No-Arguments.cmake:1 \\(list\\):.*list sub-command FIND requires three arguments.*")
+
+set(Insert-No-Arguments-RESULT 1)
+set(Insert-No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Insert-No-Arguments.cmake:1 \\(list\\):.*list sub-command INSERT requires at least three arguments.*")
+
+set(Remove_Item-No-Arguments-RESULT 1)
+set(Remove_Item-No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Remove_Item-No-Arguments.cmake:1 \\(list\\):.*list sub-command REMOVE_ITEM requires two or more arguments.*")
+
+set(Reverse-No-Arguments-RESULT 1)
+set(Reverse-No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Reverse-No-Arguments.cmake:1 \\(list\\):.*list sub-command REVERSE requires a list as an argument.*")
+
+set(Reverse-Too-Many-Arguments-RESULT 1)
+set(Reverse-Too-Many-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Reverse-Too-Many-Arguments.cmake:1 \\(list\\):.*list sub-command REVERSE only takes one argument.*")
+
+set(Remove_Duplicates-No-Arguments-RESULT 1)
+set(Remove_Duplicates-No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Remove_Duplicates-No-Arguments.cmake:1 \\(list\\):.*list sub-command REMOVE_DUPLICATES requires a list as an argument.*")
+
+set(Remove_Duplicates-Too-Many-Arguments-RESULT 1)
+set(Remove_Duplicates-Too-Many-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Remove_Duplicates-Too-Many-Arguments.cmake:1 \\(list\\):.*list sub-command REMOVE_DUPLICATES only takes one argument.*")
+
+set(Sort-No-Arguments-RESULT 1)
+set(Sort-No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Sort-No-Arguments.cmake:1 \\(list\\):.*list sub-command SORT requires a list as an argument.*")
+
+set(Sort-Too-Many-Arguments-RESULT 1)
+set(Sort-Too-Many-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Sort-Too-Many-Arguments.cmake:1 \\(list\\):.*list sub-command SORT only takes one argument.*")
+
+set(Remove_At-No-Arguments-RESULT 1)
+set(Remove_At-No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-Remove_At-No-Arguments.cmake:1 \\(list\\):.*list sub-command REMOVE_AT requires at least two arguments.*")
+
+include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake")
+check_cmake_test(List
+ No-Arguments
+ Length-Too-Many-Arguments
+ Get-No-Arguments
+ Append-No-Arguments
+ Find-No-Arguments
+ Insert-No-Arguments
+ Remove_Item-No-Arguments
+ Reverse-No-Arguments
+ Reverse-Too-Many-Arguments
+ Remove_Duplicates-No-Arguments
+ Remove_Duplicates-Too-Many-Arguments
+ Sort-No-Arguments
+ Sort-Too-Many-Arguments
+ Remove_At-No-Arguments
+)
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Tests/CMakeTests/List-Append-No-Arguments.cmake | 1 +
Tests/CMakeTests/List-Find-No-Arguments.cmake | 1 +
Tests/CMakeTests/List-Get-No-Arguments.cmake | 1 +
Tests/CMakeTests/List-Insert-No-Arguments.cmake | 1 +
.../List-Length-Too-Many-Arguments.cmake | 1 +
Tests/CMakeTests/List-No-Arguments.cmake | 1 +
Tests/CMakeTests/List-Remove_At-No-Arguments.cmake | 1 +
.../List-Remove_Duplicates-No-Arguments.cmake | 1 +
...List-Remove_Duplicates-Too-Many-Arguments.cmake | 1 +
.../CMakeTests/List-Remove_Item-No-Arguments.cmake | 1 +
Tests/CMakeTests/List-Reverse-No-Arguments.cmake | 1 +
.../List-Reverse-Too-Many-Arguments.cmake | 1 +
Tests/CMakeTests/List-Sort-No-Arguments.cmake | 1 +
.../CMakeTests/List-Sort-Too-Many-Arguments.cmake | 1 +
Tests/CMakeTests/ListTest.cmake.in | 60 ++++++++++++++++++++
16 files changed, 75 insertions(+), 1 deletions(-)
create mode 100644 Tests/CMakeTests/List-Append-No-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-Find-No-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-Get-No-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-Insert-No-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-Length-Too-Many-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-No-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-Remove_At-No-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-Remove_Duplicates-No-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-Remove_Duplicates-Too-Many-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-Remove_Item-No-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-Reverse-No-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-Reverse-Too-Many-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-Sort-No-Arguments.cmake
create mode 100644 Tests/CMakeTests/List-Sort-Too-Many-Arguments.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list