[Cmake-commits] [cmake-commits] hoffman committed cmCTestTestHandler.cxx 1.70 1.71

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv14908

Modified Files:
	cmCTestTestHandler.cxx 
Log Message:
BUG: fix for bug 7136


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.70
retrieving revision 1.71
diff -C 2 -d -r1.70 -r1.71
*** cmCTestTestHandler.cxx	30 May 2008 13:14:25 -0000	1.70
--- cmCTestTestHandler.cxx	17 Jun 2008 18:03:49 -0000	1.71
***************
*** 1555,1563 ****
      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"
--- 1555,1567 ----
      SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
      SPACE_REGEX "*>([^<]*)</DartMeasurement>");
!   cmsys::RegularExpression cdatastart(
      "<DartMeasurement"
      SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
      SPACE_REGEX "*(name|type|encoding|compression)=\"([^\"]*)\""
!     SPACE_REGEX "*>"
!     SPACE_REGEX "*<!\\[CDATA\\[");
!   cmsys::RegularExpression cdataend(
!     "]]>"
!     SPACE_REGEX "*</DartMeasurement>");
    cmsys::RegularExpression measurementfile(
      "<DartMeasurementFile"
***************
*** 1619,1636 ****
          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) )
--- 1623,1640 ----
          fourattributes.end() - fourattributes.start());
        }
!     else if ( cdatastart.find(cxml) && cdataend.find(cxml) )
        {
        ostr
          << "\t\t\t<NamedMeasurement"
!         << " " << cdatastart.match(1) << "=\""
!         << cdatastart.match(2) << "\""
!         << " " << cdatastart.match(3) << "=\""
!         << cdatastart.match(4) << "\""
!         << "><Value><![CDATA["
!         << cxml.substr(cdatastart.end(), cdataend.start() - cdatastart.end())
!         << "]]></Value></NamedMeasurement>"
          << std::endl;
!       cxml.erase(cdatastart.start(),
!         cdataend.end() - cdatastart.start());
        }
      else if ( measurementfile.find(cxml) )