From 2dce48ff80dd77bd788952b10a481aa90dfad20e Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 16 Aug 2013 15:46:07 -0400 Subject: [PATCH] Fix RunCMake.Configure test expectation newline matching Teach FailCopyFileABI-check.cmake to convert CRLF to LF in the regular expression read literally from its own source. --- Tests/RunCMake/Configure/FailCopyFileABI-check.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tests/RunCMake/Configure/FailCopyFileABI-check.cmake b/Tests/RunCMake/Configure/FailCopyFileABI-check.cmake index c439aac7d..db0cb0a34 100644 --- a/Tests/RunCMake/Configure/FailCopyFileABI-check.cmake +++ b/Tests/RunCMake/Configure/FailCopyFileABI-check.cmake @@ -4,10 +4,11 @@ if(EXISTS "${log}") else() set(error_log "") 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:.* Unable to find the executable at any of: .*\\.missing") +if(NOT error_log MATCHES "${regex}") 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}") endif()