[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3917-g06b0ea0

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  06b0ea04c420a031e10d7c5c2e10e69659a396e5 (commit)
       via  2dce48ff80dd77bd788952b10a481aa90dfad20e (commit)
      from  e05df8cf1a731eb39ac6e3f7b5d74821e08f02ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06b0ea04c420a031e10d7c5c2e10e69659a396e5
commit 06b0ea04c420a031e10d7c5c2e10e69659a396e5
Merge: e05df8c 2dce48f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 16 16:13:29 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 16 16:13:29 2013 -0400

    Merge topic 'fix-RunCMake.Configure-FailCopyFileABI-newlines' into next
    
    2dce48f Fix RunCMake.Configure test expectation newline matching


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2dce48ff80dd77bd788952b10a481aa90dfad20e
commit 2dce48ff80dd77bd788952b10a481aa90dfad20e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 16 15:46:07 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 16 16:10:15 2013 -0400

    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.

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

-----------------------------------------------------------------------

Summary of changes:
 .../RunCMake/Configure/FailCopyFileABI-check.cmake |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake