Explorar o código

Dynamic analysis test output should not be compressed.

Zach Mullen %!s(int64=14) %!d(string=hai) anos
pai
achega
8024c53389
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      Source/CTest/cmCTestRunTest.cxx

+ 3 - 2
Source/CTest/cmCTestRunTest.cxx

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