[Cmake-commits] CMake branch, next, updated. v3.2.1-1333-g128b0c6

[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  128b0c61bf2b5fed81e1f9ee1970e9bd63668f1e (commit)
       via  b687d672815d45aab9d8043eef23405525aa98e2 (commit)
      from  0740c7982f8f91f97223e6167d975eb488df2fc2 (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=128b0c61bf2b5fed81e1f9ee1970e9bd63668f1e
commit 128b0c61bf2b5fed81e1f9ee1970e9bd63668f1e
Merge: 0740c79 b687d67
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 16:06:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 31 16:06:46 2015 -0400

    Merge topic 'ctest-repeat-until-fail' into next
    
    b687d672 Tests: Fix RunCMake.CTestCommandLine expected output time matching


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b687d672815d45aab9d8043eef23405525aa98e2
commit b687d672815d45aab9d8043eef23405525aa98e2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 16:04:29 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 31 16:04:29 2015 -0400

    Tests: Fix RunCMake.CTestCommandLine expected output time matching
    
    When matching ctest command-line output, we must account for the
    formatting of times that take 10 seconds or more.  The values are
    right-justified, so use " +" to match any amount of space before them.

diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-ctest-stdout.txt b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-ctest-stdout.txt
index 0bc4f70..6e133cd 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-ctest-stdout.txt
+++ b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-ctest-stdout.txt
@@ -1,26 +1,26 @@
 ^Test project .*/Tests/RunCMake/CTestCommandLine/repeat-until-fail-build
     Start 1: initialization
-    Test #1: initialization ...................   Passed    [0-9.]+ sec
+    Test #1: initialization ...................   Passed +[0-9.]+ sec
     Start 1: initialization
-    Test #1: initialization ...................   Passed    [0-9.]+ sec
+    Test #1: initialization ...................   Passed +[0-9.]+ sec
     Start 1: initialization
-1/4 Test #1: initialization ...................   Passed    [0-9.]+ sec
+1/4 Test #1: initialization ...................   Passed +[0-9.]+ sec
     Start 2: test1
-    Test #2: test1 ............................   Passed    [0-9.]+ sec
+    Test #2: test1 ............................   Passed +[0-9.]+ sec
     Start 2: test1
-    Test #2: test1 ............................\*\*\*Failed    [0-9.]+ sec
+    Test #2: test1 ............................\*\*\*Failed +[0-9.]+ sec
     Start 3: hello
-    Test #3: hello ............................   Passed    [0-9.]+ sec
+    Test #3: hello ............................   Passed +[0-9.]+ sec
     Start 3: hello
-    Test #3: hello ............................   Passed    [0-9.]+ sec
+    Test #3: hello ............................   Passed +[0-9.]+ sec
     Start 3: hello
-3/4 Test #3: hello ............................   Passed    [0-9.]+ sec
+3/4 Test #3: hello ............................   Passed +[0-9.]+ sec
     Start 4: goodbye
-    Test #4: goodbye ..........................   Passed    [0-9.]+ sec
+    Test #4: goodbye ..........................   Passed +[0-9.]+ sec
     Start 4: goodbye
-    Test #4: goodbye ..........................   Passed    [0-9.]+ sec
+    Test #4: goodbye ..........................   Passed +[0-9.]+ sec
     Start 4: goodbye
-4/4 Test #4: goodbye ..........................   Passed    [0-9.]+ sec
+4/4 Test #4: goodbye ..........................   Passed +[0-9.]+ sec
 +
 75% tests passed, 1 tests failed out of 4
 +

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

Summary of changes:
 .../repeat-until-fail-ctest-stdout.txt             |   22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake