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

BUG: Remove maximum size of test output

Browse Source
This commit is contained in:
Andy Cedilnik 2004-09-29 14:14:17 -04:00
parent 70c973ba10
commit 64a6ad4975
2 changed files with 1 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Source/CTest/cmCTestTestHandler.cxx
View File

@ -197,9 +197,6 @@ cmCTestTestHandler::cmCTestTestHandler()
m_UseIncludeRegExp = false; m_UseIncludeRegExp = false;
m_UseExcludeRegExp = false; m_UseExcludeRegExp = false;
m_UseExcludeRegExpFirst = false; m_UseExcludeRegExpFirst = false;
m_MaximumPassedTestResultSize = 100 * 1024;
m_MaximumFailedTestResultSize = 200 * 1024;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -214,26 +211,6 @@ void cmCTestTestHandler::PopulateCustomVectors(cmMakefile *mf)
cmCTest::PopulateCustomVector(mf, "CTEST_CUSTOM_POST_MEMCHECK", cmCTest::PopulateCustomVector(mf, "CTEST_CUSTOM_POST_MEMCHECK",
m_CustomPostMemCheck); m_CustomPostMemCheck);
const char* maxstr =
mf->GetDefinition("CTEST_CUSTOM_PASSED_TEST_STRING_MAXLEN");
if ( maxstr )
{
long val = atoi(maxstr);
if ( val > 0 )
{
m_MaximumPassedTestResultSize = val;
}
}
maxstr = mf->GetDefinition("CTEST_CUSTOM_FAILED_TEST_STRING_MAXLEN");
if ( maxstr )
{
long val = atoi(maxstr);
if ( val > 0 )
{
m_MaximumFailedTestResultSize = val;
}
}
cmCTest::PopulateCustomVector(mf, cmCTest::PopulateCustomVector(mf,
"CTEST_CUSTOM_TESTS_IGNORE", "CTEST_CUSTOM_TESTS_IGNORE",
m_CustomTestsIgnore); m_CustomTestsIgnore);
@ -843,27 +820,7 @@ void cmCTestTestHandler::GenerateDartTestOutput(std::ostream& os)
os os
<< "\t\t\t<Measurement>\n" << "\t\t\t<Measurement>\n"
<< "\t\t\t\t<Value>"; << "\t\t\t\t<Value>";
size_t truncate = result->m_Output.size(); os << cmCTest::MakeXMLSafe(result->m_Output);
if ( result->m_Status == cmCTestTestHandler::COMPLETED )
{
if ( result->m_Output.size() > m_MaximumPassedTestResultSize )
{
truncate = m_MaximumPassedTestResultSize;
}
}
else
{
if ( result->m_Output.size() > m_MaximumFailedTestResultSize )
{
truncate = m_MaximumFailedTestResultSize;
}
}
os << cmCTest::MakeXMLSafe(result->m_Output.substr(0, truncate));
if ( truncate < result->m_Output.size() )
{
os << "...\n\nThe output was stirpped because it excedes maximum allowed size: "
<< truncate << std::endl;
}
os os
<< "</Value>\n" << "</Value>\n"
<< "\t\t\t</Measurement>\n" << "\t\t\t</Measurement>\n"

4
Source/CTest/cmCTestTestHandler.h
View File

@ -204,10 +204,6 @@ private:
bool ProcessMemCheckPurifyOutput(const std::string& str, bool ProcessMemCheckPurifyOutput(const std::string& str,
std::string& log, int* results); std::string& log, int* results);
///! Maximum size of testing string
std::string::size_type m_MaximumPassedTestResultSize;
std::string::size_type m_MaximumFailedTestResultSize;
std::string TestsToRunString; std::string TestsToRunString;
}; };