diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-05-23 16:09:45 -0400 |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-05-23 16:09:45 -0400 |
| commit | 78adfd6a7ef2f1cddad934a7de6da940a1985d36 (patch) | |
| tree | d68e7c539a713d6145a878002c898410c59e59fd /Source/CTest | |
| parent | cc487c481dee998e4570f8b17ede47ef33031e9e (diff) | |
| download | cmake-78adfd6a7ef2f1cddad934a7de6da940a1985d36.tar.gz | |
ENH: push in changes from head
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 2c70de40cf..9a6792e4c7 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1543,6 +1543,11 @@ std::string cmCTestTestHandler::GenerateRegressionImages( SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\"" SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\"" SPACE_REGEX "*>([^<]*)</DartMeasurement>"); + cmsys::RegularExpression cdatameasurement( + "<DartMeasurement" + SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\"" + SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\"" + SPACE_REGEX "*>(<!\\[CDATA\\[([^]]*\\]?[^]]+)*]]>)</DartMeasurement>"); cmsys::RegularExpression measurementfile( "<DartMeasurementFile" SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\"" @@ -1602,6 +1607,21 @@ std::string cmCTestTestHandler::GenerateRegressionImages( cxml.erase(fourattributes.start(), fourattributes.end() - fourattributes.start()); } + else if ( cdatameasurement.find(cxml) ) + { + ostr + << "\t\t\t<NamedMeasurement" + << " " << cdatameasurement.match(1) << "=\"" + << cdatameasurement.match(2) << "\"" + << " " << cdatameasurement.match(3) << "=\"" + << cdatameasurement.match(4) << "\"" + << "><Value>" << cdatameasurement.match(5) + << "</Value></NamedMeasurement>" + << std::endl; + + cxml.erase(cdatameasurement.start(), + cdatameasurement.end() - cdatameasurement.start()); + } else if ( measurementfile.find(cxml) ) { const std::string& filename = |