From 2507f937bd3f287e1905ef25ce2c37e616037671 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 8 Oct 2010 09:46:38 -0400 Subject: 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. --- Tests/ArgumentExpansion/CMakeLists.txt | 6 +++--- Tests/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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") -- cgit v0.12