[Cmake-commits] CMake branch, next, updated. v3.5.0-653-g52485db

[Zack Galbreath]

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  52485db76cef8bc24c8f11060234bded6d602060 (commit)
       via  06b7f5d2cac5e697b503337e870e34b11a592bd1 (commit)
      from  dc161109dbca44ee48b4a1b2a7cf1936ffa5aace (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52485db76cef8bc24c8f11060234bded6d602060
commit 52485db76cef8bc24c8f11060234bded6d602060
Merge: dc16110 06b7f5d
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Thu Mar 24 09:25:00 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 24 09:25:00 2016 -0400

    Merge topic 'only_change_timeout_once' into next
    
    06b7f5d2 CTest: Only apply the secondary test timeout once


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06b7f5d2cac5e697b503337e870e34b11a592bd1
commit 06b7f5d2cac5e697b503337e870e34b11a592bd1
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Mar 23 12:09:41 2016 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Mar 23 12:09:41 2016 -0400

    CTest: Only apply the secondary test timeout once
    
    This commit fixes a bug in the implementation of the test property
    TIMEOUT_AFTER_MATCH.  The new timeout value was being applied
    every time a line was output by the test after the match had been
    encountered.  Now the new timeout value is only set once.
    
    This commit also improves some output formatting related to this
    property.

diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 7f3a077..f329e77 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -77,11 +77,13 @@ bool cmCTestRunTest::CheckOutput()
           if ( regIt->first.find(this->ProcessOutput.c_str()) )
             {
             cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
+                       this->GetIndex() << ": " <<
                        "Test timeout changed to " <<
                        this->TestProperties->AlternateTimeout << std::endl);
             this->TestProcess->ResetStartTime();
             this->TestProcess->ChangeTimeout(
               this->TestProperties->AlternateTimeout);
+            this->TestProperties->TimeoutRegularExpressions.clear();
             break;
             }
           }

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

Summary of changes:
 Source/CTest/cmCTestRunTest.cxx |    2 ++
 1 file changed, 2 insertions(+)


hooks/post-receive
-- 
CMake