[Cmake-commits] CMake branch, next, updated. v2.8.4-1485-g48e8970

[Zach Mullen]

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  48e89708ffea959d7c28bf2a4e4b5b457aa2395d (commit)
       via  8024c53389df3ef404725e3d0c5d91a8f7eafbfc (commit)
       via  14f43c3e496b46889db9c1e30e5a2d7ea73a6cb7 (commit)
       via  cade78040dc2a3996795bbd7c29579d0b444cc82 (commit)
       via  a3a581f8cd9aac31c22498eb87aafc60ab1f35c3 (commit)
      from  6bb0a215825834cd51c8f005ad022f127c0338e6 (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=48e89708ffea959d7c28bf2a4e4b5b457aa2395d
commit 48e89708ffea959d7c28bf2a4e4b5b457aa2395d
Merge: 6bb0a21 8024c53
Author:     Zach Mullen <zach.mullen at kitware.com>
AuthorDate: Fri Apr 29 12:12:58 2011 -0400
Commit:     Zach Mullen <zach.mullen at kitware.com>
CommitDate: Fri Apr 29 12:12:58 2011 -0400

    Merge branch 'dont-compress-memcheck-output' into next
    
    * dont-compress-memcheck-output:
      Dynamic analysis test output should not be compressed.
      KWSys Nightly Date Stamp
      KWSys Nightly Date Stamp
      KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8024c53389df3ef404725e3d0c5d91a8f7eafbfc
commit 8024c53389df3ef404725e3d0c5d91a8f7eafbfc
Author:     Zach Mullen <zach.mullen at kitware.com>
AuthorDate: Fri Apr 29 12:12:26 2011 -0400
Commit:     Zach Mullen <zach.mullen at kitware.com>
CommitDate: Fri Apr 29 12:12:26 2011 -0400

    Dynamic analysis test output should not be compressed.

diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 42a4cff..e9cefae 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -135,7 +135,7 @@ void cmCTestRunTest::CompressOutput()
 //---------------------------------------------------------
 bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
 {
-  if (this->CTest->ShouldCompressTestOutput())
+  if (!this->TestHandler->MemCheck && this->CTest->ShouldCompressTestOutput())
     {
     this->CompressOutput();
     }
@@ -332,7 +332,8 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
   // record the results in TestResult 
   if(started)
     {
-    bool compress = this->CompressionRatio < 1 &&
+    bool compress = !this->TestHandler->MemCheck &&
+      this->CompressionRatio < 1 &&
       this->CTest->ShouldCompressTestOutput();
     this->TestResult.Output = compress ? this->CompressedOutput 
       : this->ProcessOutput;

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

Summary of changes:
 Source/CTest/cmCTestRunTest.cxx   |    5 +++--
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake