kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix segfault on Borland compiler resulting from divide by 0.

Browse Source
This commit is contained in:
Zach Mullen 2009-12-18 11:42:58 -05:00
parent 918355632c
commit 66f44f64d5
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/CTest/cmCTestRunTest.cxx
View File

@ -26,7 +26,7 @@ cmCTestRunTest::cmCTestRunTest(cmCTestTestHandler* handler)
this->TestProcess = 0; this->TestProcess = 0;
this->TestResult.ExecutionTime =0; this->TestResult.ExecutionTime =0;
this->TestResult.ReturnValue = 0; this->TestResult.ReturnValue = 0;
this->TestResult.Status = 0; this->TestResult.Status = cmCTestTestHandler::NOT_RUN;
this->TestResult.TestCount = 0; this->TestResult.TestCount = 0;
this->TestResult.Properties = 0; this->TestResult.Properties = 0;
this->ProcessOutput = ""; this->ProcessOutput = "";
@ -108,20 +108,23 @@ void cmCTestRunTest::CompressOutput()
} }
(void)deflateEnd(&strm); (void)deflateEnd(&strm);
unsigned char *encoded_buffer unsigned char *encoded_buffer
= new unsigned char[static_cast<int>(outSize * 1.5)]; = new unsigned char[static_cast<int>(outSize * 1.5)];
unsigned long rlen unsigned long rlen
= cmsysBase64_Encode(out, strm.total_out, encoded_buffer, 1); = cmsysBase64_Encode(out, strm.total_out, encoded_buffer, 1);
for(unsigned long i = 0; i < rlen; i++) for(unsigned long i = 0; i < rlen; i++)
{ {
this->CompressedOutput += encoded_buffer[i]; this->CompressedOutput += encoded_buffer[i];
} }
this->CompressionRatio = static_cast<double>(strm.total_out) / if(strm.total_in)
static_cast<double>(strm.total_in); {
this->CompressionRatio = static_cast<double>(strm.total_out) /
static_cast<double>(strm.total_in);
}
delete [] encoded_buffer; delete [] encoded_buffer;
delete [] out; delete [] out;
@ -269,18 +272,11 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
// Output since that is what is parsed by cmCTestMemCheckHandler // Output since that is what is parsed by cmCTestMemCheckHandler
if(!this->TestHandler->MemCheck && started) if(!this->TestHandler->MemCheck && started)
{ {
if (this->TestResult.Status == cmCTestTestHandler::COMPLETED)
{
this->TestHandler->CleanTestOutput(this->ProcessOutput, this->TestHandler->CleanTestOutput(this->ProcessOutput,
static_cast<size_t> static_cast<size_t>
(this->TestHandler->CustomMaximumPassedTestOutputSize)); (this->TestResult.Status == cmCTestTestHandler::COMPLETED ?
} this->TestHandler->CustomMaximumPassedTestOutputSize :
else this->TestHandler->CustomMaximumFailedTestOutputSize));
{
this->TestHandler->CleanTestOutput(this->ProcessOutput,
static_cast<size_t>
(this->TestHandler->CustomMaximumFailedTestOutputSize));
}
} }
this->TestResult.Reason = reason; this->TestResult.Reason = reason;
if (this->TestHandler->LogFile) if (this->TestHandler->LogFile)
@ -325,7 +321,7 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
<< "----------------------------------------------------------" << "----------------------------------------------------------"
<< std::endl << std::endl; << std::endl << std::endl;
} }
// if the test actually stared and ran // if the test actually started and ran
// record the results in TestResult // record the results in TestResult
if(started) if(started)
{ {