kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change the failure case string to 'Unexpected'

Browse Source 
VS6 detects the 'Error' string and fails itself even though we don't
actually care about it unless CMAKE_STRICT is on.
This commit is contained in:
Ben Boeckel 2010-10-08 09:46:38 -04:00
parent fe390a2607
commit 2507f937bd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/ArgumentExpansion/CMakeLists.txt
View File

@ -7,7 +7,7 @@ function (argument_tester expected expected_len)
list(LENGTH ${expected} expected_received_len) list(LENGTH ${expected} expected_received_len)
if (NOT ${expected_received_len} EQUAL ${expected_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}) endif (NOT ${expected_received_len} EQUAL ${expected_len})
if (${argn_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) list(GET ${expected} ${i} expected_value)
if (NOT ${argn_value} STREQUAL ${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 " Expected: ${expected_value}")
message(STATUS " Received: ${argn_value}") message(STATUS " Received: ${argn_value}")
endif (NOT ${argn_value} STREQUAL ${expected_value}) endif (NOT ${argn_value} STREQUAL ${expected_value})
@ -25,7 +25,7 @@ function (argument_tester expected expected_len)
math(EXPR i "${i} + 1") math(EXPR i "${i} + 1")
endwhile (i LESS ${argn_len}) endwhile (i LESS ${argn_len})
else (${argn_len} EQUAL ${expected_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 " Expected: ${expected_len}")
message(STATUS " Received: ${argn_len}") message(STATUS " Received: ${argn_len}")
endif (${argn_len} EQUAL ${expected_len}) endif (${argn_len} EQUAL ${expected_len})

2
Tests/CMakeLists.txt
View File

@ -379,7 +379,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
) )
IF(CMAKE_STRICT) IF(CMAKE_STRICT)
SET_TESTS_PROPERTIES(ArgumentExpansion PROPERTIES SET_TESTS_PROPERTIES(ArgumentExpansion PROPERTIES
FAIL_REGULAR_EXPRESSION "Error: ") FAIL_REGULAR_EXPRESSION "Unexpected: ")
ENDIF(CMAKE_STRICT) ENDIF(CMAKE_STRICT)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ArgumentExpansion") LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ArgumentExpansion")