[Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-745-g966b73f

Zack Galbreath zack.galbreath at kitware.com
Wed Feb 25 16:22:26 EST 2015


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  966b73f5903810892388aecd379d844e1d830169 (commit)
       via  4f0ba0ac922325f46c7fa513d117f0aef076e625 (commit)
      from  731f11216cb3f40fd7ab5facfc037759e4e62838 (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=966b73f5903810892388aecd379d844e1d830169
commit 966b73f5903810892388aecd379d844e1d830169
Merge: 731f112 4f0ba0a
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 16:22:26 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 16:22:26 2015 -0500

    Merge topic 'error_in_read_script' into next
    
    4f0ba0ac more attempts to get ctest_build passing


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f0ba0ac922325f46c7fa513d117f0aef076e625
commit 4f0ba0ac922325f46c7fa513d117f0aef076e625
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 16:22:08 2015 -0500
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Feb 25 16:22:08 2015 -0500

    more attempts to get ctest_build passing
    
    Similar to last commit, account for difference in numbers of
    errors & warnings detected by different compilers.

diff --git a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
index 3ecb292..1d7c09c 100644
--- a/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
+++ b/Tests/RunCMake/ctest_build/BuildCompileError-stdout.txt
@@ -11,6 +11,6 @@ Configure project
 Build project
    Each symbol represents 1024 bytes of output.
    '!' represents an error and '\*' a warning.
-    . Size of output: [0-9]+K
+    [.*!]+ Size of output: [0-9]+K
    [1-9][0-9]* Compiler errors
    [0-9]+ Compiler warnings

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list