[Cmake-commits] CMake branch, next, updated. v2.8.9-870-g9670d87
Rolf Eike Beer
eike at sf-mail.de
Sat Sep 29 10:28:11 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 9670d87405573b45a82c98b092f9412d8430023b (commit)
via 74dc5aaeb7c04196ad29bc6055409f34a3fe932e (commit)
from c53454e28a212205b3b846a8ddec18d220a7b8db (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=9670d87405573b45a82c98b092f9412d8430023b
commit 9670d87405573b45a82c98b092f9412d8430023b
Merge: c53454e 74dc5aa
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Sep 29 10:28:10 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 29 10:28:10 2012 -0400
Merge topic 'start-contributing-irc-session' into next
74dc5aa Consolidate list() argument count testing
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74dc5aaeb7c04196ad29bc6055409f34a3fe932e
commit 74dc5aaeb7c04196ad29bc6055409f34a3fe932e
Author: Petr Kmoch <petr.kmoch at gmail.com>
AuthorDate: Sat Sep 29 15:41:29 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Sep 29 16:26:50 2012 +0200
Consolidate list() argument count testing
Move test for list() argument count >= 2 to InitialPass().
diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 7848424..df64695 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -15,13 +15,14 @@
#include <stdlib.h> // required for atoi
#include <ctype.h>
+#include <assert.h>
//----------------------------------------------------------------------------
bool cmListCommand
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
{
- if(args.size() < 1)
+ if(args.size() < 2)
{
- this->SetError("must be called with at least one argument.");
+ this->SetError("must be called with at least two arguments.");
return false;
}
@@ -243,11 +244,7 @@ bool cmListCommand::HandleGetCommand(std::vector<std::string> const& args)
//----------------------------------------------------------------------------
bool cmListCommand::HandleAppendCommand(std::vector<std::string> const& args)
{
- if(args.size() < 2)
- {
- this->SetError("sub-command APPEND requires at least one argument.");
- return false;
- }
+ assert(args.size() >= 2);
// Skip if nothing to append.
if(args.size() < 3)
@@ -424,12 +421,8 @@ bool cmListCommand
bool cmListCommand
::HandleReverseCommand(std::vector<std::string> const& args)
{
- if(args.size() < 2)
- {
- this->SetError("sub-command REVERSE requires a list as an argument.");
- return false;
- }
- else if(args.size() > 2)
+ assert(args.size() >= 2);
+ if(args.size() > 2)
{
this->SetError(
"sub-command REVERSE only takes one argument.");
@@ -463,13 +456,8 @@ bool cmListCommand
bool cmListCommand
::HandleRemoveDuplicatesCommand(std::vector<std::string> const& args)
{
- if(args.size() < 2)
- {
- this->SetError(
- "sub-command REMOVE_DUPLICATES requires a list as an argument.");
- return false;
- }
- else if(args.size() > 2)
+ assert(args.size() >= 2);
+ if(args.size() > 2)
{
this->SetError(
"sub-command REMOVE_DUPLICATES only takes one argument.");
@@ -513,12 +501,8 @@ bool cmListCommand
bool cmListCommand
::HandleSortCommand(std::vector<std::string> const& args)
{
- if(args.size() < 2)
- {
- this->SetError("sub-command SORT requires a list as an argument.");
- return false;
- }
- else if(args.size() > 2)
+ assert(args.size() >= 2);
+ if(args.size() > 2)
{
this->SetError(
"sub-command SORT only takes one argument.");
diff --git a/Tests/CMakeTests/List-Find-No-Arguments.cmake b/Tests/CMakeTests/List-Find-No-Arguments.cmake
index c170092..7f99e94 100644
--- a/Tests/CMakeTests/List-Find-No-Arguments.cmake
+++ b/Tests/CMakeTests/List-Find-No-Arguments.cmake
@@ -1 +1 @@
-list(FIND)
+list(FIND mylist)
diff --git a/Tests/CMakeTests/List-Get-No-Arguments.cmake b/Tests/CMakeTests/List-Get-No-Arguments.cmake
index e8af86c..8bb14d7 100644
--- a/Tests/CMakeTests/List-Get-No-Arguments.cmake
+++ b/Tests/CMakeTests/List-Get-No-Arguments.cmake
@@ -1 +1 @@
-list(GET)
+list(GET mylist)
diff --git a/Tests/CMakeTests/List-Insert-No-Arguments.cmake b/Tests/CMakeTests/List-Insert-No-Arguments.cmake
index 4eefe45..6fa7ed6 100644
--- a/Tests/CMakeTests/List-Insert-No-Arguments.cmake
+++ b/Tests/CMakeTests/List-Insert-No-Arguments.cmake
@@ -1 +1 @@
-list(INSERT)
+list(INSERT mylist)
diff --git a/Tests/CMakeTests/List-Invalid-Subcommand.cmake b/Tests/CMakeTests/List-Invalid-Subcommand.cmake
index 40f2345..f35a118 100644
--- a/Tests/CMakeTests/List-Invalid-Subcommand.cmake
+++ b/Tests/CMakeTests/List-Invalid-Subcommand.cmake
@@ -1 +1 @@
-list(NO_SUCH_SUBCOMMAND)
+list(NO_SUCH_SUBCOMMAND mylist)
diff --git a/Tests/CMakeTests/List-Remove_At-No-Arguments.cmake b/Tests/CMakeTests/List-Remove_At-No-Arguments.cmake
index 836c7a6..f9e763c 100644
--- a/Tests/CMakeTests/List-Remove_At-No-Arguments.cmake
+++ b/Tests/CMakeTests/List-Remove_At-No-Arguments.cmake
@@ -1 +1 @@
-list(REMOVE_AT)
+list(REMOVE_AT mylist)
diff --git a/Tests/CMakeTests/List-Remove_Item-No-Arguments.cmake b/Tests/CMakeTests/List-Remove_Item-No-Arguments.cmake
index d1329ad..31a4aaa 100644
--- a/Tests/CMakeTests/List-Remove_Item-No-Arguments.cmake
+++ b/Tests/CMakeTests/List-Remove_Item-No-Arguments.cmake
@@ -1 +1 @@
-list(REMOVE_ITEM)
+list(REMOVE_ITEM mylist)
diff --git a/Tests/CMakeTests/ListTest.cmake.in b/Tests/CMakeTests/ListTest.cmake.in
index 6869627..09fa7b9 100644
--- a/Tests/CMakeTests/ListTest.cmake.in
+++ b/Tests/CMakeTests/ListTest.cmake.in
@@ -99,7 +99,12 @@ 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(No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-No-Arguments.cmake:1 \\(list\\):.*list must be called with at least two arguments.*")
+
+foreach(cmd Append Reverse Remove_Duplicates Sort) # these currently trigger top-level condition
+ set(${cmd}-No-Arguments-RESULT 1)
+ set(${cmd}-No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?List-${cmd}-No-Arguments.cmake:1 \\(list\\):.*list must be called with at least two arguments.*")
+endforeach()
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.*")
@@ -107,9 +112,6 @@ set(Length-Too-Many-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DI
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.*")
@@ -119,21 +121,12 @@ set(Insert-No-Arguments-STDERR ".*CMake Error at (@CMAKE_CURRENT_SOURCE_DIR@/)?L
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.*")
-----------------------------------------------------------------------
Summary of changes:
Source/cmListCommand.cxx | 36 +++++--------------
Tests/CMakeTests/List-Find-No-Arguments.cmake | 2 +-
Tests/CMakeTests/List-Get-No-Arguments.cmake | 2 +-
Tests/CMakeTests/List-Insert-No-Arguments.cmake | 2 +-
Tests/CMakeTests/List-Invalid-Subcommand.cmake | 2 +-
Tests/CMakeTests/List-Remove_At-No-Arguments.cmake | 2 +-
.../CMakeTests/List-Remove_Item-No-Arguments.cmake | 2 +-
Tests/CMakeTests/ListTest.cmake.in | 19 +++-------
8 files changed, 22 insertions(+), 45 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list