diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-28 13:56:51 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-28 13:56:51 (GMT) |
| commit | a2312986af0356854d7cf9eac1d45f9d957abf72 (patch) | |
| tree | b64d16b5793de4eb7b01d8a9aaac5ed3cbb3c6e5 /Source/CTest/cmCTestTestHandler.cxx | |
| parent | cc55c33ed5196409a296e1eb27627f4284b1c081 (diff) | |
| parent | b26e5b552a53521ba06d27835cac2a6f72d70dfc (diff) | |
| download | CMake-a2312986af0356854d7cf9eac1d45f9d957abf72.zip CMake-a2312986af0356854d7cf9eac1d45f9d957abf72.tar.gz CMake-a2312986af0356854d7cf9eac1d45f9d957abf72.tar.bz2 | |
Merge topic 'ctest-xml-minor-cleanup'
b26e5b55 CTest: Generate NamedMeasurement elements directly into xml file
965cf8e6 CTest: Drop stray content from Configure.xml
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 ab5c11b..7eb8392 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 @@ -1827,8 +1827,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" @@ -1863,7 +1863,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 ) @@ -2025,7 +2024,6 @@ std::string cmCTestTestHandler::GenerateRegressionImages( done = true; } } - return ostr.str(); } //---------------------------------------------------------------------- |