diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2015-05-23 23:00:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-05-26 14:40:00 (GMT) |
| commit | b26e5b552a53521ba06d27835cac2a6f72d70dfc (patch) | |
| tree | 0de35df30a489e4475b907f1d493e0f0607afcf7 /Source/CTest/cmCTestTestHandler.cxx | |
| parent | 965cf8e66e8316f34113c219d9311edee34bfd3b (diff) | |
| download | CMake-b26e5b552a53521ba06d27835cac2a6f72d70dfc.zip CMake-b26e5b552a53521ba06d27835cac2a6f72d70dfc.tar.gz CMake-b26e5b552a53521ba06d27835cac2a6f72d70dfc.tar.bz2 | |
CTest: Generate NamedMeasurement elements directly into xml file
Re-order the logic to avoid use of a temporary std::ostringstream.
Diffstat (limited to 'Source/CTest/cmCTestTestHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index b1c479e..aa68461 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1185,7 +1185,7 @@ void cmCTestTestHandler::GenerateDartOutput(std::ostream& os) << "</Value></NamedMeasurement>" << std::endl; } - os << result->RegressionImages; + this->GenerateRegressionImages(os, result->DartString); os << "\t\t\t<NamedMeasurement type=\"numeric/double\" " << "name=\"Execution Time\"><Value>" << result->ExecutionTime @@ -1828,8 +1828,8 @@ void cmCTestTestHandler::ExpandTestsToRunInformationForRerunFailed() // Just for convenience #define SPACE_REGEX "[ \t\r\n]" //---------------------------------------------------------------------- -std::string cmCTestTestHandler::GenerateRegressionImages( - const std::string& xml) +void cmCTestTestHandler::GenerateRegressionImages( + std::ostream& ostr, const std::string& xml) { cmsys::RegularExpression twoattributes( "<DartMeasurement" @@ -1864,7 +1864,6 @@ std::string cmCTestTestHandler::GenerateRegressionImages( SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\"" SPACE_REGEX "*>([^<]*)</DartMeasurementFile>"); - std::ostringstream ostr; bool done = false; std::string cxml = xml; while ( ! done ) @@ -2026,7 +2025,6 @@ std::string cmCTestTestHandler::GenerateRegressionImages( done = true; } } - return ostr.str(); } //---------------------------------------------------------------------- |