diff options
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 45 | ||||
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.h | 4 |
2 files changed, 1 insertions, 48 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 2ab9744..a19e180 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -197,9 +197,6 @@ cmCTestTestHandler::cmCTestTestHandler() m_UseIncludeRegExp = false; m_UseExcludeRegExp = 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", 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, "CTEST_CUSTOM_TESTS_IGNORE", m_CustomTestsIgnore); @@ -843,27 +820,7 @@ void cmCTestTestHandler::GenerateDartTestOutput(std::ostream& os) os << "\t\t\t<Measurement>\n" << "\t\t\t\t<Value>"; - size_t truncate = result->m_Output.size(); - 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 << cmCTest::MakeXMLSafe(result->m_Output); os << "</Value>\n" << "\t\t\t</Measurement>\n" diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index 785f019..9d7f451 100644 --- a/Source/CTest/cmCTestTestHandler.h +++ b/Source/CTest/cmCTestTestHandler.h @@ -204,10 +204,6 @@ private: bool ProcessMemCheckPurifyOutput(const std::string& str, 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; }; |