[cmake-commits] hoffman committed cmCTestTestHandler.cxx 1.54 1.55
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jul 25 16:37:52 EDT 2007
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv23001
Modified Files:
cmCTestTestHandler.cxx
Log Message:
ENH: fix bug with valgrind output being truncated
Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- cmCTestTestHandler.cxx 17 May 2007 17:20:44 -0000 1.54
+++ cmCTestTestHandler.cxx 25 Jul 2007 20:37:50 -0000 1.55
@@ -784,15 +784,20 @@
}
}
- if ( cres.Status == cmCTestTestHandler::COMPLETED )
- {
- this->CleanTestOutput(output, static_cast<size_t>
- (this->CustomMaximumPassedTestOutputSize));
- }
- else
+ // if this is doing MemCheck then all the output needs to be put into
+ // Output since that it what is parsed to by cmCTestMemCheckHandler
+ if(!this->MemCheck)
{
- this->CleanTestOutput(output, static_cast<size_t>
- (this->CustomMaximumFailedTestOutputSize));
+ if ( cres.Status == cmCTestTestHandler::COMPLETED )
+ {
+ this->CleanTestOutput(output, static_cast<size_t>
+ (this->CustomMaximumPassedTestOutputSize));
+ }
+ else
+ {
+ this->CleanTestOutput(output, static_cast<size_t>
+ (this->CustomMaximumFailedTestOutputSize));
+ }
}
cres.Output = output;
More information about the Cmake-commits
mailing list