[Cmake-commits] CMake branch, next, updated. v2.8.2-1033-g571446e

[Ben Boeckel]

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  571446efd45aaf3f214aa2f256e4a8e5c6a81fc2 (commit)
       via  2507f937bd3f287e1905ef25ce2c37e616037671 (commit)
      from  94ed8dbe202db1ee68be2e768cbba2a97b8f755a (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=571446efd45aaf3f214aa2f256e4a8e5c6a81fc2
commit 571446efd45aaf3f214aa2f256e4a8e5c6a81fc2
Merge: 94ed8db 2507f93
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Oct 8 09:48:00 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 8 09:48:00 2010 -0400

    Merge topic 'dev/strict-mode' into next
    
    2507f93 Change the failure case string to 'Unexpected'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2507f937bd3f287e1905ef25ce2c37e616037671
commit 2507f937bd3f287e1905ef25ce2c37e616037671
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Oct 8 09:46:38 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Oct 8 09:46:38 2010 -0400

    Change the failure case string to 'Unexpected'
    
    VS6 detects the 'Error' string and fails itself even though we don't
    actually care about it unless CMAKE_STRICT is on.

diff --git a/Tests/ArgumentExpansion/CMakeLists.txt b/Tests/ArgumentExpansion/CMakeLists.txt
index bd78169..6201706 100644
--- a/Tests/ArgumentExpansion/CMakeLists.txt
+++ b/Tests/ArgumentExpansion/CMakeLists.txt
@@ -7,7 +7,7 @@ function (argument_tester expected expected_len)
     list(LENGTH ${expected} expected_received_len)
 
     if (NOT ${expected_received_len} EQUAL ${expected_len})
-        message(STATUS "Error: Expanding expected values isn't working")
+        message(STATUS "Unexpected: Expanding expected values isn't working")
     endif (NOT ${expected_received_len} EQUAL ${expected_len})
 
     if (${argn_len} EQUAL ${expected_len})
@@ -17,7 +17,7 @@ function (argument_tester expected expected_len)
             list(GET ${expected} ${i} expected_value)
 
             if (NOT ${argn_value} STREQUAL ${expected_value})
-                message(STATUS "Error: Argument ${i} doesn't match")
+                message(STATUS "Unexpected: Argument ${i} doesn't match")
                 message(STATUS "    Expected: ${expected_value}")
                 message(STATUS "    Received: ${argn_value}")
             endif (NOT ${argn_value} STREQUAL ${expected_value})
@@ -25,7 +25,7 @@ function (argument_tester expected expected_len)
             math(EXPR i "${i} + 1")
         endwhile (i LESS ${argn_len})
     else (${argn_len} EQUAL ${expected_len})
-        message(STATUS "Error: Lengths of arguments don't match")
+        message(STATUS "Unexpected: Lengths of arguments don't match")
         message(STATUS "    Expected: ${expected_len}")
         message(STATUS "    Received: ${argn_len}")
     endif (${argn_len} EQUAL ${expected_len})
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index a725354..ac36327 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -379,7 +379,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     )
   IF(CMAKE_STRICT)
     SET_TESTS_PROPERTIES(ArgumentExpansion PROPERTIES
-      FAIL_REGULAR_EXPRESSION "Error: ")
+      FAIL_REGULAR_EXPRESSION "Unexpected: ")
   ENDIF(CMAKE_STRICT)
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ArgumentExpansion")
 

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

Summary of changes:
 Tests/ArgumentExpansion/CMakeLists.txt |    6 +++---
 Tests/CMakeLists.txt                   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake