[Cmake-commits] CMake branch, next, updated. v3.2.2-2030-gdbf0573

[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  dbf05735115aae9a5cba878adc096cb09c8af8ad (commit)
       via  b5b20d2050616b186cf5b676bbb15772a347ffdd (commit)
      from  8e0ecf91b3d50a0e69a00db52d1d79ca91afecc4 (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=dbf05735115aae9a5cba878adc096cb09c8af8ad
commit dbf05735115aae9a5cba878adc096cb09c8af8ad
Merge: 8e0ecf9 b5b20d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 22 08:30:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 22 08:30:19 2015 -0400

    Merge topic 'deterministic-CTest-tests' into next
    
    b5b20d20 ctest: Treat ENV{CTEST_OUTPUT_ON_FAILURE} as a boolean


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5b20d2050616b186cf5b676bbb15772a347ffdd
commit b5b20d2050616b186cf5b676bbb15772a347ffdd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 22 08:27:19 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 22 08:27:19 2015 -0400

    ctest: Treat ENV{CTEST_OUTPUT_ON_FAILURE} as a boolean
    
    Having this variable in the environment should not be enough to activate
    the behavior.  It must also not be set to a false value (or empty value).

diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 3697aa4..403a459 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -332,9 +332,9 @@ cmCTest::cmCTest()
   this->ComputedCompressMemCheckOutput = false;
   this->RepeatTests = 1; // default to run each test once
   this->RepeatUntilFail = false;
-  if(cmSystemTools::GetEnv("CTEST_OUTPUT_ON_FAILURE"))
+  if(const char* outOnFail = cmSystemTools::GetEnv("CTEST_OUTPUT_ON_FAILURE"))
     {
-    this->OutputTestOutputOnTestFailure = true;
+    this->OutputTestOutputOnTestFailure = !cmSystemTools::IsOff(outOnFail);
     }
   this->InitStreams();
 

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

Summary of changes:
 Source/cmCTest.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake