[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1189-g5d0d719

[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  5d0d71905dc79d422fe5ec22111d1062b7d5e9a7 (commit)
       via  29533380ea887e3f5eab44260bbd77933cf91ca9 (commit)
      from  2123458b2d7eb2c3ab2a7a6275098477de1176a2 (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=5d0d71905dc79d422fe5ec22111d1062b7d5e9a7
commit 5d0d71905dc79d422fe5ec22111d1062b7d5e9a7
Merge: 2123458 2953338
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 16 13:38:39 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 16 13:38:39 2014 -0500

    Merge topic 'test-RunCMake-updates' into next
    
    29533380 Tests: Allow RunCMake expected result code to be a regex


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29533380ea887e3f5eab44260bbd77933cf91ca9
commit 29533380ea887e3f5eab44260bbd77933cf91ca9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 16 13:33:47 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 16 13:34:34 2014 -0500

    Tests: Allow RunCMake expected result code to be a regex
    
    This will allow the '-result.txt' files to specify a regex matching
    different results on different platforms.

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 56d69c8..7b1a5b2 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -65,7 +65,7 @@ function(run_cmake test)
       )
   endif()
   set(msg "")
-  if(NOT "${actual_result}" STREQUAL "${expect_result}")
+  if(NOT "${actual_result}" MATCHES "${expect_result}")
     set(msg "${msg}Result is [${actual_result}], not [${expect_result}].\n")
   endif()
   foreach(o out err)

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

Summary of changes:
 Tests/RunCMake/RunCMake.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake