[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3560-g79301ad

[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  79301ad9f7f84452e8340484089e7f0a55f7eaa6 (commit)
       via  6446eb099ac962fbbd464bbabeb61c7626236688 (commit)
      from  5652a4d581de0ff680af32cec0706ea38dbf581e (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=79301ad9f7f84452e8340484089e7f0a55f7eaa6
commit 79301ad9f7f84452e8340484089e7f0a55f7eaa6
Merge: 5652a4d 6446eb0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 5 10:50:49 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 5 10:50:49 2014 -0400

    Merge topic 'fix-ctest-option-summary' into next
    
    6446eb09 CTest: Added option description for --output-on-failure


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6446eb099ac962fbbd464bbabeb61c7626236688
commit 6446eb099ac962fbbd464bbabeb61c7626236688
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Jun 5 12:35:14 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 5 10:51:39 2014 -0400

    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:


hooks/post-receive
-- 
CMake