[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2957-gb2d853b

[Rolf Eike Beer]

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  b2d853ba2b589af9dd8859a1a6cbdd7970f5c0e2 (commit)
       via  12cf7bc507e914c48289b73d241c5c9fea091ce8 (commit)
      from  004a65617987728c66fc29d6cc2141f30f75ee52 (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=b2d853ba2b589af9dd8859a1a6cbdd7970f5c0e2
commit b2d853ba2b589af9dd8859a1a6cbdd7970f5c0e2
Merge: 004a656 12cf7bc
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat May 11 06:16:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat May 11 06:16:00 2013 -0400

    Merge topic 'only-first-output-regex' into next
    
    12cf7bc CTest: break after first regex match on output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12cf7bc507e914c48289b73d241c5c9fea091ce8
commit 12cf7bc507e914c48289b73d241c5c9fea091ce8
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat May 11 12:14:37 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat May 11 12:15:38 2013 +0200

    CTest: break after first regex match on output
    
    PASS_REGULAR_EXPRESSION and FAIL_REGULAR_EXPRESSION both take a list of expressions.
    Stop searching if the first of those has matched the output as the result will not
    change anymore.

diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 5eabf3f..fc1bcb5 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -166,6 +166,7 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
         {
         found = true;
         reason = "Required regular expression found.";
+        break;
         }
       }
     if ( !found )
@@ -196,6 +197,7 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
         reason += passIt->second;
         reason += "]";
         forceFail = true;
+        break;
         }
       }
     }

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

Summary of changes:
 Source/CTest/cmCTestRunTest.cxx |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake