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

CPackTest spit out more output in case of failure

This commit is contained in:
Eric NOULARD 2010-12-12 12:19:50 +01:00 committed by Bill Hoffman
parent dd2a5aa69f
commit 58bd4f2185
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
View File

@ -20,14 +20,23 @@ endif(NOT CPackComponentWay)
set(expected_file_mask "") set(expected_file_mask "")
# The usual default behavior is to expect a single file # The usual default behavior is to expect a single file
# Then some specific generators (Archive, RPM, ...)
# May produce several numbers of files depending on
# CPACK_COMPONENT_xxx values
set(expected_count 1) set(expected_count 1)
execute_process(COMMAND ${CPackCommand} -G ${CPackGen} execute_process(COMMAND ${CPackCommand} -G ${CPackGen}
RESULT_VARIABLE result RESULT_VARIABLE CPack_result
OUTPUT_VARIABLE stdout OUTPUT_VARIABLE CPack_output
ERROR_VARIABLE stderr ERROR_VARIABLE CPack_error
WORKING_DIRECTORY ${CPackComponentsForAll_BINARY_DIR}) WORKING_DIRECTORY ${CPackComponentsForAll_BINARY_DIR})
if (CPack_result)
message(SEND_ERROR "CPack_output=${CPack_output}")
message(SEND_ERROR "CPack_error=${CPack_error}")
message(FATAL_ERROR "error: CPack execution went wrong!")
endif(CPack_result)
if(CPackGen MATCHES "ZIP") if(CPackGen MATCHES "ZIP")
set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.zip") set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.zip")
if (${CPackComponentWay} STREQUAL "default") if (${CPackComponentWay} STREQUAL "default")
@ -46,12 +55,16 @@ if(expected_file_mask)
message(STATUS "expected_file_mask='${expected_file_mask}'") message(STATUS "expected_file_mask='${expected_file_mask}'")
if(NOT expected_file) if(NOT expected_file)
message(SEND_ERROR "CPack_output=${CPack_output}")
message(SEND_ERROR "CPack_error=${CPack_error}")
message(FATAL_ERROR "error: expected_file=${expected_file} does not exist: CPackComponentsForAll test fails.") message(FATAL_ERROR "error: expected_file=${expected_file} does not exist: CPackComponentsForAll test fails.")
endif(NOT expected_file) endif(NOT expected_file)
list(LENGTH expected_file actual_count) list(LENGTH expected_file actual_count)
message(STATUS "actual_count='${actual_count}'") message(STATUS "actual_count='${actual_count}'")
if(NOT actual_count EQUAL expected_count) if(NOT actual_count EQUAL expected_count)
message(SEND_ERROR "CPack_output=${CPack_output}")
message(SEND_ERROR "CPack_error=${CPack_error}")
message(FATAL_ERROR "error: expected_count=${expected_count} does not match actual_count=${actual_count}: CPackComponents test fails.") message(FATAL_ERROR "error: expected_count=${expected_count} does not match actual_count=${actual_count}: CPackComponents test fails.")
endif(NOT actual_count EQUAL expected_count) endif(NOT actual_count EQUAL expected_count)
endif(expected_file_mask) endif(expected_file_mask)