[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3544-g4cc0cdc

[Nils Gladitz]

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  4cc0cdc9eb38c177689c560c6c77e240c72428a3 (commit)
       via  3c9441182fef32d6afe593a51aa969857b3d2f09 (commit)
       via  8ab2d7d462a0f812b4ce1c555c6a7cbcea7abfef (commit)
      from  de150055b3a2d16751a72594979edfc53a153112 (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=4cc0cdc9eb38c177689c560c6c77e240c72428a3
commit 4cc0cdc9eb38c177689c560c6c77e240c72428a3
Merge: de15005 3c94411
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Jun 5 06:36:16 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 5 06:36:16 2014 -0400

    Merge topic 'fix-ctest-option-summary' into next
    
    3c944118 CTest: Added option description for --output-on-failure
    8ab2d7d4 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c9441182fef32d6afe593a51aa969857b3d2f09
commit 3c9441182fef32d6afe593a51aa969857b3d2f09
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Jun 5 12:35:14 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Thu Jun 5 12:35:14 2014 +0200

    CTest: Added option description for --output-on-failure
    
    Without it the option list is cut short after --debug.

diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 3eb5551..b6b3d31 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -44,7 +44,8 @@ static const char * cmDocumentationOptions[][2] =
   {"-V,--verbose", "Enable verbose output from tests."},
   {"-VV,--extra-verbose", "Enable more verbose output from tests."},
   {"--debug", "Displaying more verbose internals of CTest."},
-  {"--output-on-failure"},
+  {"--output-on-failure", "Output anything outputted by the test program "
+    "if the test should fail."},
   {"-F", "Enable failover."},
   {"-j <jobs>, --parallel <jobs>", "Run the tests in parallel using the"
    "given number of jobs."},

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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Source/ctest.cxx          |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake