diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-16 19:46:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-08-16 20:10:15 (GMT) |
| commit | 2dce48ff80dd77bd788952b10a481aa90dfad20e (patch) | |
| tree | 51595763784202b67e9e295a2dc6b5e18ced68ee /Tests/RunCMake/Configure | |
| parent | 4dc4018553856fb2dae47ea608b8a09221b155fa (diff) | |
| download | CMake-2dce48ff80dd77bd788952b10a481aa90dfad20e.zip CMake-2dce48ff80dd77bd788952b10a481aa90dfad20e.tar.gz CMake-2dce48ff80dd77bd788952b10a481aa90dfad20e.tar.bz2 | |
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.
Diffstat (limited to 'Tests/RunCMake/Configure')
| -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() |