[Cmake-commits] CMake branch, next, updated. v3.0.0-4088-g93704c1

[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  93704c1fe754edf720125be6992e404438ee8014 (commit)
       via  15e61f9bd96d528bc50217de1fcd8285fd033cf2 (commit)
      from  402be9c58e49356d556b41dd01c8e66266d2b6fc (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=93704c1fe754edf720125be6992e404438ee8014
commit 93704c1fe754edf720125be6992e404438ee8014
Merge: 402be9c 15e61f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 2 10:39:46 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 2 10:39:46 2014 -0400

    Merge topic 'fix-CTestTestTimeout-output-order' into next
    
    15e61f9b Tests: Fix CTestTestTimeout output order to match regex


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15e61f9bd96d528bc50217de1fcd8285fd033cf2
commit 15e61f9bd96d528bc50217de1fcd8285fd033cf2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 2 10:37:42 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 2 10:40:17 2014 -0400

    Tests: Fix CTestTestTimeout output order to match regex
    
    Print the "timeout correctly killed" message using message(STATUS) so
    that 'ctest -S' puts it in the same pipe as the rest of the test command
    handler output.  This ensures it shows up in the same order every time.

diff --git a/Tests/CTestTestTimeout/test.cmake.in b/Tests/CTestTestTimeout/test.cmake.in
index 68c74d8..af53383 100644
--- a/Tests/CTestTestTimeout/test.cmake.in
+++ b/Tests/CTestTestTimeout/test.cmake.in
@@ -32,7 +32,7 @@ if(EXISTS "${log}")
   if(after_sleep)
     message(FATAL_ERROR "Log indicates timeout did not kill child.")
   else()
-    message("Log indicates timeout correctly killed child.")
+    message(STATUS "Log indicates timeout correctly killed child.")
   endif()
 else()
   message(FATAL_ERROR "Log does not exist:\n  ${log}")

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

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


hooks/post-receive
-- 
CMake