Merge topic 'fix-RunCMake.Configure-FailCopyFileABI-newlines'

2dce48f Fix RunCMake.Configure test expectation newline matching
This commit is contained in:
Brad King 2013-08-26 13:14:16 -04:00 committed by CMake Topic Stage
commit ae4630fb1d
1 changed files with 2 additions and 1 deletions

View File

@ -4,10 +4,11 @@ if(EXISTS "${log}")
else() else()
set(error_log "") set(error_log "")
endif() endif()
if(NOT error_log MATCHES "Cannot copy output executable.* string(REPLACE "\r\n" "\n" regex "Cannot copy output executable.*
to destination specified by COPY_FILE:.* to destination specified by COPY_FILE:.*
Unable to find the executable at any of: Unable to find the executable at any of:
.*\\.missing") .*\\.missing")
if(NOT error_log MATCHES "${regex}")
string(REGEX REPLACE "\n" "\n " error_log " ${error_log}") string(REGEX REPLACE "\n" "\n " error_log " ${error_log}")
set(RunCMake_TEST_FAILED "Log file:\n ${log}\ndoes not have expected COPY_FILE failure message:\n${error_log}") set(RunCMake_TEST_FAILED "Log file:\n ${log}\ndoes not have expected COPY_FILE failure message:\n${error_log}")
endif() endif()