瀏覽代碼

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

2dce48f Fix RunCMake.Configure test expectation newline matching
Brad King 12 年之前
父節點
當前提交
ae4630fb1d
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      Tests/RunCMake/Configure/FailCopyFileABI-check.cmake

+ 2 - 1
Tests/RunCMake/Configure/FailCopyFileABI-check.cmake

@@ -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()