[Cmake-commits] [cmake-commits] hoffman committed cmCTestBuildAndTestHandler.cxx 1.20 1.20.2.1 cmCTestTestHandler.cxx 1.68.2.2 1.68.2.3

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cmCTestBuildAndTestHandler.cxx cmCTestTestHandler.cxx 
Log Message:
ENH: merge in changes from main tree


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.68.2.2
retrieving revision 1.68.2.3
diff -C 2 -d -r1.68.2.2 -r1.68.2.3
*** cmCTestTestHandler.cxx	13 Jun 2008 12:55:18 -0000	1.68.2.2
--- cmCTestTestHandler.cxx	25 Jun 2008 13:51:45 -0000	1.68.2.3
***************
*** 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) )

Index: cmCTestBuildAndTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildAndTestHandler.cxx,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C 2 -d -r1.20 -r1.20.2.1
*** cmCTestBuildAndTestHandler.cxx	17 Sep 2007 14:40:57 -0000	1.20
--- cmCTestBuildAndTestHandler.cxx	25 Jun 2008 13:51:40 -0000	1.20.2.1
***************
*** 144,147 ****
--- 144,154 ----
  }
  
+ void CMakeProgressCallback(const char*msg, float , void * s)
+ {
+   std::string* out = (std::string*)s;
+   *out += msg;
+   *out += "\n";
+ }
+ 
  //----------------------------------------------------------------------
  void CMakeStdoutCallback(const char* m, int len, void* s)
***************
*** 211,214 ****
--- 218,222 ----
    // should we cmake?
    cmake cm;
+   cm.SetProgressCallback(CMakeProgressCallback, &cmakeOutString); 
    cm.SetGlobalGenerator(cm.CreateGlobalGenerator(
        this->BuildGenerator.c_str()));