diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-26 17:14:16 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-08-26 17:14:16 (GMT) |
| commit | ae4630fb1dd2f5d51f9fbea7007336af07eb83c9 (patch) | |
| tree | c45a1f1629d6593f400398bf5b601ee678ce6252 /Tests | |
| parent | c5baca780472a6e2ec1615bed2619be98482b992 (diff) | |
| parent | 2dce48ff80dd77bd788952b10a481aa90dfad20e (diff) | |
| download | CMake-ae4630fb1dd2f5d51f9fbea7007336af07eb83c9.zip CMake-ae4630fb1dd2f5d51f9fbea7007336af07eb83c9.tar.gz CMake-ae4630fb1dd2f5d51f9fbea7007336af07eb83c9.tar.bz2 | |
Merge topic 'fix-RunCMake.Configure-FailCopyFileABI-newlines'
2dce48f Fix RunCMake.Configure test expectation newline matching
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/Configure/FailCopyFileABI-check.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/RunCMake/Configure/FailCopyFileABI-check.cmake b/Tests/RunCMake/Configure/FailCopyFileABI-check.cmake index c439aac..db0cb0a 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() |