Browse Source

BUG: Couple of memcheck bugs: Log files should really be different for test and memcheck. Also make sure to not trunkate the output of the test until the valgrind or any other checking is pefrormed.

Andy Cedilnik 19 years ago
parent
commit
867e41d23b
2 changed files with 5 additions and 1 deletions
  1. 4 0
      Source/CTest/cmCTestMemCheckHandler.cxx
  2. 1 1
      Source/CTest/cmCTestTestHandler.cxx

+ 4 - 0
Source/CTest/cmCTestMemCheckHandler.cxx

@@ -88,6 +88,8 @@ static const char* cmCTestMemCheckResultLongStrings[] = {
 cmCTestMemCheckHandler::cmCTestMemCheckHandler()
 {
   this->MemCheck = true;
+  this->CustomMaximumPassedTestOutputSize = 0;
+  this->CustomMaximumFailedTestOutputSize = 0;
 }
 
 //----------------------------------------------------------------------
@@ -224,6 +226,8 @@ void cmCTestMemCheckHandler::GenerateDartOutput(std::ostream& os)
       {
       continue;
       }
+    this->CleanTestOutput(memcheckstr,
+      static_cast<size_t>(this->CustomMaximumFailedTestOutputSize));
     os << "\t<Test Status=\"";
     if ( result->Status == cmCTestMemCheckHandler::COMPLETED )
       {

+ 1 - 1
Source/CTest/cmCTestTestHandler.cxx

@@ -457,7 +457,7 @@ int cmCTestTestHandler::ProcessHandler()
     }
 
   cmGeneratedFileStream mLogFile;
-  this->StartLogFile("Tests", mLogFile);
+  this->StartLogFile((this->MemCheck ? "DynamicAnalysis" : "Test"), mLogFile);
   this->LogFile = &mLogFile;
 
   std::vector<cmStdString> passed;