Split ctest into two three files

4 files changed, 1475 insertions, 1458 deletions

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 755aafb..bc0e132 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -90,7 +90,7 @@ LINK_DIRECTORIES(${CMake_BINARY_DIR}/Source)
 
 ADD_EXECUTABLE(cmake cmakemain.cxx)
 ADD_EXECUTABLE(DumpDocumentation cmDumpDocumentation)
-ADD_EXECUTABLE(ctest ctest.cxx)
+ADD_EXECUTABLE(ctest ctest.cxx cmCTest.cxx)
 
 IF (UNIX)
   TARGET_LINK_LIBRARIES(CMakeLib ${CMAKE_DL_LIBS})
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
new file mode 100644
index 0000000..33f1758
--- /dev/null
+++ b/Source/cmCTest.cxx
@@ -0,0 +1,1469 @@
+/*=========================================================================
+
+  Program:   CMake - Cross-Platform Makefile Generator
+  Module:    $RCSfile$
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+  Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
+  See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+#include "cmCTest.h"
+#include "cmRegularExpression.h"
+#include "cmSystemTools.h"
+#include "cmListFileCache.h"
+
+#include <stdio.h>
+#include <time.h>
+
+static std::string CleanString(std::string str)
+{
+  std::string::size_type spos = str.find_first_not_of(" \n\t");
+  std::string::size_type epos = str.find_last_not_of(" \n\t");
+  if ( spos == str.npos )
+    {
+    return std::string();
+    }
+  if ( epos != str.npos )
+    {
+    epos = epos - spos + 1;
+    }
+  return str.substr(spos, epos);
+}
+
+static std::string CurrentTime()
+{
+  time_t currenttime = time(0);
+  return ::CleanString(ctime(&currenttime));
+}
+
+static const char* cmCTestErrorMatches[] = {
+  "^[Bb]us [Ee]rror",
+  "^[Ss]egmentation [Vv]iolation",
+  "^[Ss]egmentation [Ff]ault",
+  "([^ :]+):([0-9]+): ([^ \\t])",
+  "([^:]+): error[ \\t]*[0-9]+[ \\t]*:",
+  "^Error ([0-9]+):",
+  "^Error ",
+  "^\"[^\"]+\", line [0-9]+: [^Ww]",
+  "^cc[^C]*CC: ERROR File = ([^,]+), Line = ([0-9]+)",
+  "^ld([^:])*:([ \\t])*ERROR([^:])*:",
+  "^ild:([ \\t])*\\(undefined symbol\\)",
+  "([^ :]+) : (error|fatal error|catastrophic error)",
+  "([^:]+): (Error:|error|undefined reference|multiply defined)",
+  "([^:]+)\\(([^\\)]+)\\) : (error|fatal error|catastrophic error)",
+  "^fatal error C[0-9]+:",
+  ": syntax error ",
+  "^collect2: ld returned 1 exit status",
+  "Unsatisfied symbols:",
+  "Undefined symbols:",
+  "^Undefined[ \\t]+first referenced",
+  "^CMake Error:",
+  ":[ \\t]cannot find",
+  0
+};
+
+static const char* cmCTestErrorExceptions[] = {
+  0
+};
+
+static const char* cmCTestWarningMatches[] = {
+  "([^ :]+):([0-9]+): warning:",
+  "^cc[^C]*CC: WARNING File = ([^,]+), Line = ([0-9]+)",
+  "^ld([^:])*:([ \\t])*WARNING([^:])*:",
+  "([^:]+): warning ([0-9]+):",
+  "^\"[^\"]+\", line [0-9]+: [Ww]arning",
+  "([^:]+): warning[ \\t]*[0-9]+[ \\t]*:",
+  "^Warning ([0-9]+):",
+  "^Warning ",
+  "([^ :]+) : warning",
+  "([^:]+): warning",
+  0
+};
+
+static const char* cmCTestWarningExceptions[] = {
+  "/usr/openwin/include/X11/Xlib\\.h:[0-9]+: warning: ANSI C\\+\\+ forbids declaration",
+  "/usr/openwin/include/X11/Xutil\\.h:[0-9]+: warning: ANSI C\\+\\+ forbids declaration",
+  "/usr/openwin/include/X11/XResource\\.h:[0-9]+: warning: ANSI C\\+\\+ forbids declaration",
+  "WARNING 84 :",
+  "WARNING 47 :",
+  "makefile:",
+  "Makefile:",
+  "warning:  Clock skew detected.  Your build may be incomplete.",
+  "/usr/openwin/include/GL/[^:]+:",
+  "bind_at_load",
+  "XrmQGetResource",
+  "IceFlush",
+  "warning LNK4089: all references to .GDI32.dll. discarded by .OPT:REF",
+  "warning LNK4089: all references to .USER32.dll. discarded by .OPT:REF",
+  "ld32: WARNING 85: definition of dataKey in",
+  0
+};
+
+std::string cmCTest::MakeXMLSafe(const std::string& str)
+{
+  std::string::size_type pos = 0;
+  cmOStringStream ost;
+  char buffer[10];
+  for ( pos = 0; pos < str.size(); pos ++ )
+    {
+    char ch = str[pos];
+    if ( ch > 126 )
+      {
+      sprintf(buffer, "&%x", (int)ch);
+      ost << buffer;
+      }
+    else
+      {
+      switch ( ch )
+        {
+        case '&': ost << "&amp;"; break;
+        case '<': ost << "&lt;"; break;
+        case '>': ost << "&gt;"; break;
+        default: ost << ch;
+        }
+      }
+    }
+  return ost.str();
+}
+
+bool TryExecutable(const char *dir, const char *file,
+                   std::string *fullPath, const char *subdir)
+{
+  // try current directory
+  std::string tryPath;
+  if (dir && strcmp(dir,""))
+    {
+    tryPath = dir;
+    tryPath += "/";
+    }
+  
+  if (subdir && strcmp(subdir,""))
+    {
+    tryPath += subdir;
+    tryPath += "/";
+    }
+  
+  tryPath += file;
+  if(cmSystemTools::FileExists(tryPath.c_str()))
+    {
+    *fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
+    return true;
+    }
+  tryPath += cmSystemTools::GetExecutableExtension();
+  if(cmSystemTools::FileExists(tryPath.c_str()))
+    {
+    *fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
+    return true;
+    }
+  return false;
+}
+
+cmCTest::cmCTest() 
+{ 
+  m_UseIncludeRegExp      = false;
+  m_UseExcludeRegExp      = false;
+  m_UseExcludeRegExpFirst = false;
+  m_Verbose               = false;
+  m_DartMode              = false;
+  m_ShowOnly              = false;
+  int cc; 
+  for ( cc=0; cc < cmCTest::LAST_TEST; cc ++ )
+    {
+    m_Tests[cc] = 0;
+    }
+}
+
+void cmCTest::Initialize()
+{
+  m_ToplevelPath = cmSystemTools::GetCurrentWorkingDirectory();
+  // parse the dart test file
+  std::ifstream fin("DartConfiguration.tcl");
+  if(!fin)
+    {
+    return;
+    }
+
+  char buffer[1024];
+  while ( fin )
+    {
+    buffer[0] = 0;
+    fin.getline(buffer, 1023);
+    buffer[1023] = 0;
+    std::string line = ::CleanString(buffer);
+    if(line.size() == 0)
+      {
+      continue;
+      }
+    while ( fin && (line[line.size()-1] == '\\') )
+      {
+      line = line.substr(0, line.size()-1);
+      buffer[0] = 0;
+      fin.getline(buffer, 1023);
+      buffer[1023] = 0;
+      line += ::CleanString(buffer);
+      }
+    if ( line[0] == '#' )
+      {
+      continue;
+      }
+    std::string::size_type cpos = line.find_first_of(":");
+    if ( cpos == line.npos )
+      {
+      continue;
+      }
+    std::string key = line.substr(0, cpos);
+    std::string value = ::CleanString(line.substr(cpos+1, line.npos));
+    m_DartConfiguration[key] = value;
+    }
+  fin.close();
+  if ( m_DartMode )
+    {
+    std::string testingDir = m_ToplevelPath + "/Testing/CDart";
+    if ( cmSystemTools::FileExists(testingDir.c_str()) )
+      {
+      if ( !cmSystemTools::FileIsDirectory(testingDir.c_str()) )
+        {
+        std::cerr << "File " << testingDir << " is in the place of the testing directory"
+                  << std::endl;
+        return;
+        }
+      }
+    else
+      {
+      if ( !cmSystemTools::MakeDirectory(testingDir.c_str()) )
+        {
+        std::cerr << "Cannot create directory " << testingDir
+                  << std::endl;
+        return;
+        }
+      }
+    std::string tagfile = testingDir + "/TAG";
+    std::ifstream tfin(tagfile.c_str());
+    std::string tag;
+    time_t tctime = time(0);
+    struct tm *lctime = gmtime(&tctime);
+    if ( tfin )
+      {
+      tfin >> tag;
+      tfin.close();
+      int year = 0;
+      int mon = 0;
+      int day = 0;
+      int hour = 0;
+      int min = 0;
+      sscanf(tag.c_str(), "%04d%02d%02d-%02d%02d",
+             &year, &mon, &day, &hour, &min);
+      if ( year != lctime->tm_year + 1900 ||
+           mon != lctime->tm_mon ||
+           day != lctime->tm_mday )
+        {
+        tag = "";
+        }
+
+      }
+    if ( tag.size() == 0 )
+      {
+      char datestring[100];
+      sprintf(datestring, "%04d%02d%02d-%02d%02d",
+              lctime->tm_year + 1900,
+              lctime->tm_mon,
+              lctime->tm_mday,
+              lctime->tm_hour,
+              lctime->tm_min);
+      tag = datestring;
+      std::ofstream ofs(tagfile.c_str());
+      if ( ofs )
+        {
+        ofs << tag << std::endl;
+        }
+      ofs.close();
+      std::cout << "Create new tag: " << tag << std::endl;
+      }
+    m_CurrentTag = tag;
+    }
+}
+
+bool cmCTest::SetTest(const char* ttype)
+{
+  if ( cmSystemTools::LowerCase(ttype) == "all" )
+    {
+    m_Tests[cmCTest::ALL_TEST] = 1;
+    }
+  else if ( cmSystemTools::LowerCase(ttype) == "update" )
+    {
+    m_Tests[cmCTest::UPDATE_TEST] = 1;
+    }
+  else if ( cmSystemTools::LowerCase(ttype) == "configure" )
+    {
+    m_Tests[cmCTest::CONFIGURE_TEST] = 1;
+    }
+  else if ( cmSystemTools::LowerCase(ttype) == "build" )
+    {
+    m_Tests[cmCTest::BUILD_TEST] = 1;
+    }
+  else if ( cmSystemTools::LowerCase(ttype) == "test" )
+    {
+    m_Tests[cmCTest::TEST_TEST] = 1;
+    }
+  else if ( cmSystemTools::LowerCase(ttype) == "coverage" )
+    {
+    m_Tests[cmCTest::COVERAGE_TEST] = 1;
+    }
+  else if ( cmSystemTools::LowerCase(ttype) == "purify" )
+    {
+    m_Tests[cmCTest::PURIFY_TEST] = 1;
+    }
+  else
+    {
+    std::cerr << "Don't know about test \"" << ttype << "\" yet..." << std::endl;
+    return false;
+    }
+  return true;
+}
+
+void cmCTest::Finalize()
+{
+}
+
+std::string cmCTest::FindExecutable(const char *exe)
+{
+  std::string fullPath = "";
+  std::string dir;
+  std::string file;
+
+  cmSystemTools::SplitProgramPath(exe, dir, file);
+  if(m_ConfigType != "")
+    {
+    if(TryExecutable(dir.c_str(), file.c_str(), &fullPath, 
+                     m_ConfigType.c_str()))
+      {
+      return fullPath;
+      }
+    dir += "/";
+    dir += m_ConfigType;
+    dir += "/";
+    dir += file;
+    cmSystemTools::Error("config type specified on the command line, but test executable not found.",
+                         dir.c_str());
+    return "";
+    }
+  if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"."))
+    {
+    return fullPath;
+    }
+
+  if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,""))
+    {
+    return fullPath;
+    }
+
+  if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Release"))
+    {
+    return fullPath;
+    }
+
+  if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Debug"))
+    {
+    return fullPath;
+    }
+
+  if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"MinSizeRel"))
+    {
+    return fullPath;
+    }
+
+  if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"RelWithDebInfo"))
+    {
+    return fullPath;
+    }
+
+  // if everything else failed, check the users path
+  if (dir != "")
+    {
+    std::string path = cmSystemTools::FindProgram(file.c_str());
+    if (path != "")
+      {
+      return path;
+      }
+    }
+  
+  return fullPath;
+}
+
+int cmCTest::UpdateDirectory()
+{
+  std::string cvsCommand = m_DartConfiguration["CVSCommand"];
+  if ( cvsCommand.size() == 0 )
+    {
+    std::cerr << "Cannot find CVSCommand key in the DartConfiguration.tcl" << std::endl;
+    return 1;
+    }
+  std::string cvsOptions = m_DartConfiguration["CVSUpdateOptions"];
+  if ( cvsOptions.size() == 0 )
+    {
+    std::cerr << "Cannot find CVSUpdateOptions key in the DartConfiguration.tcl" << std::endl;
+    return 1;
+    }
+
+  std::string sourceDirectory = m_DartConfiguration["SourceDirectory"];
+  if ( sourceDirectory.size() == 0 )
+    {
+    std::cerr << "Cannot find SourceDirectory  key in the DartConfiguration.tcl" << std::endl;
+    return 1;
+    }
+
+  std::string command = cvsCommand + " update " + cvsOptions;
+
+  std::string output;
+  int retVal = 0;
+  bool res = true;
+  if ( !m_ShowOnly )
+    {
+    res = cmSystemTools::RunCommand(command.c_str(), output, 
+                                    retVal, sourceDirectory.c_str(),
+                                    m_Verbose);
+    }
+  else
+    {
+    std::cout << "Update with command: " << command << std::endl;
+    }
+  if (! res || retVal )
+    {
+    std::cerr << "Error(s) when updating the project" << std::endl;
+    return 1;
+    }
+  return 0;
+}
+
+int cmCTest::ConfigureDirectory()
+{
+  std::string cCommand = m_DartConfiguration["ConfigureCommand"];
+  if ( cCommand.size() == 0 )
+    {
+    std::cerr << "Cannot find ConfigureCommand key in the DartConfiguration.tcl" 
+              << std::endl;
+    return 1;
+    }
+
+  std::string buildDirectory = m_DartConfiguration["BuildDirectory"];
+  if ( buildDirectory.size() == 0 )
+    {
+    std::cerr << "Cannot find BuildDirectory  key in the DartConfiguration.tcl" << std::endl;
+    return 1;
+    }
+
+  std::string output;
+  int retVal = 0;
+  bool res = true;
+  if ( !m_ShowOnly )
+    {
+    res = cmSystemTools::RunCommand(cCommand.c_str(), output, 
+                                    retVal, buildDirectory.c_str(),
+                                    m_Verbose);
+    }
+  else
+    {
+    std::cout << "Configure with command: " << cCommand << std::endl;
+    }
+  if (! res || retVal )
+    {
+    std::cerr << "Error(s) when updating the project" << std::endl;
+    return 1;
+    }
+  return 0;
+}
+
+int cmCTest::BuildDirectory()
+{
+  std::string makeCommand = m_DartConfiguration["MakeCommand"];
+  if ( makeCommand.size() == 0 )
+    {
+    std::cerr << "Cannot find MakeCommand key in the DartConfiguration.tcl" << std::endl;
+    return 1;
+    }
+  std::string buildDirectory = m_DartConfiguration["BuildDirectory"];
+  if ( buildDirectory.size() == 0 )
+    {
+    std::cerr << "Cannot find BuildDirectory  key in the DartConfiguration.tcl" << std::endl;
+    return 1;
+    }
+
+  m_StartBuild = ::CurrentTime();
+  std::string output;
+  int retVal = 0;
+  bool res = true;
+  if ( !m_ShowOnly )
+    {
+    res = cmSystemTools::RunCommand(makeCommand.c_str(), output, 
+                                    retVal, buildDirectory.c_str(), 
+                                    m_Verbose);
+    }
+  else
+    {
+    std::cout << "Build with command: " << makeCommand << std::endl;
+    }
+  m_EndBuild = ::CurrentTime();
+  if (! res || retVal )
+    {
+    std::cerr << "Error(s) when building project" << std::endl;
+    }
+
+  // Parsing of output for errors and warnings.
+
+  std::vector<cmStdString> lines;
+  cmSystemTools::Split(output.c_str(), lines);
+
+  std::ofstream ofs;
+  if ( this->OpenOutputFile("Temporary", "LastBuild.log", ofs) )
+    {
+    ofs << output;
+    ofs.close();
+    }
+  else
+    {
+    std::cerr << "Cannot create LastBuild.log file" << std::endl;    
+    }
+  
+  // Lines are marked: 
+  // 0 - nothing
+  // 1 - error
+  // > 1 - warning
+  std::vector<int> markedLines(lines.size(), 0);
+  
+  int cc;
+  // Errors
+  for ( cc = 0; cmCTestErrorMatches[cc]; cc ++ )
+    {
+    cmRegularExpression re(cmCTestErrorMatches[cc]);
+    std::vector<std::string>::size_type kk;
+    for ( kk = 0; kk < lines.size(); kk ++ )
+      {
+      if ( re.find(lines[kk]) )
+        {
+        markedLines[kk] = 1;
+        }
+      }    
+    }
+  // Warnings
+  for ( cc = 0; cmCTestWarningMatches[cc]; cc ++ )
+    {
+    cmRegularExpression re(cmCTestWarningMatches[cc]);
+    std::vector<std::string>::size_type kk;
+    for ( kk = 0; kk < lines.size(); kk ++ )
+      {
+      if ( re.find(lines[kk]) )
+        {
+        markedLines[kk] += 2;
+        }
+      }    
+    }
+  // Errors exceptions
+  for ( cc = 0; cmCTestErrorExceptions[cc]; cc ++ )
+    {
+    cmRegularExpression re(cmCTestErrorExceptions[cc]);
+    std::vector<int>::size_type kk;
+    for ( kk =0; kk < markedLines.size(); kk ++ )
+      {
+      if ( markedLines[cc] == 1 )
+        {
+        if ( re.find(lines[kk]) )
+          {
+          markedLines[cc] = 0;
+          }
+        }
+      }
+    }
+  // Warning exceptions
+  for ( cc = 0; cmCTestWarningExceptions[cc]; cc ++ )
+    {
+    cmRegularExpression re(cmCTestWarningExceptions[cc]);
+    std::vector<int>::size_type kk;
+    for ( kk =0; kk < markedLines.size(); kk ++ )
+      {
+      if ( markedLines[cc] > 1 )
+        {
+        if ( re.find(lines[kk]) )
+          {
+          markedLines[cc] = 0;
+          }
+        }
+      }
+    }
+  std::vector<cmCTestBuildErrorWarning> errorsWarnings;
+
+  std::vector<int>::size_type kk;
+  cmCTestBuildErrorWarning errorwarning;
+  for ( kk =0; kk < markedLines.size(); kk ++ )
+    {
+    errorwarning.m_LineNumber = -1;
+    bool found = false;
+    if ( markedLines[kk] == 1 )
+      {
+      std::cout << "Error: " << lines[kk] << std::endl;
+      errorwarning.m_Error = true;
+      found = true;
+      }
+    else if ( markedLines[kk] > 1 )
+      {
+      std::cout << "Warning: " << lines[kk] << std::endl;
+      errorwarning.m_Error = false;
+      found = true;
+      }
+    if ( found )
+      {
+      errorwarning.m_LogLine     = static_cast<int>(kk+1);
+      errorwarning.m_Text        = lines[kk];
+      errorwarning.m_PreContext  = "";
+      errorwarning.m_PostContext = "";
+      std::vector<int>::size_type jj;
+      std::vector<int>::size_type ll = 0;
+      if ( kk > 6 )
+        {
+        ll = kk - 6;
+        }
+      for ( jj = kk; 
+            jj > 0 && jj > ll /* && markedLines[jj] == 0 */; 
+            jj -- );
+      for (; jj < kk; jj ++ )
+        {
+        errorwarning.m_PreContext += lines[jj] + "\n";
+        }
+      for ( jj = kk+1; 
+            jj < lines.size() && jj < kk + 7 /* && markedLines[jj] == 0*/; 
+            jj ++ )
+        {
+        errorwarning.m_PostContext += lines[jj] + "\n";
+        }
+      errorsWarnings.push_back(errorwarning);
+      }
+    }
+
+  if( !this->OpenOutputFile("", "Build.xml", ofs) )
+    {
+    std::cerr << "Cannot create build XML file" << std::endl;
+    return 1;
+    }
+  this->GenerateDartBuildOutput(ofs, errorsWarnings);
+  return 0;
+}
+ 
+int cmCTest::CoverageDirectory()
+{
+  std::vector<std::string> files;
+  std::vector<std::string> cfiles;
+  std::vector<std::string> cdirs;
+  bool done = false;
+  std::string::size_type cc;
+  std::string glob;
+  std::map<std::string, std::string> allsourcefiles;
+  std::map<std::string, std::string> allbinaryfiles;
+
+  std::string start_time = ::CurrentTime();
+
+  // Find all source files.
+  std::string sourceDirectory = m_DartConfiguration["SourceDirectory"];
+  if ( sourceDirectory.size() == 0 )
+    {
+    std::cerr << "Cannot find SourceDirectory  key in the DartConfiguration.tcl" << std::endl;
+    return 1;
+    }
+  cdirs.push_back(sourceDirectory);
+  while ( !done ) 
+    {
+    if ( cdirs.size() <= 0 )
+      {
+      break;
+      }
+    glob = cdirs[cdirs.size()-1] + "/*";
+    //std::cout << "Glob: " << glob << std::endl;
+    cdirs.pop_back();
+    if ( cmSystemTools::SimpleGlob(glob, cfiles, 1) )
+      {
+      for ( cc = 0; cc < cfiles.size(); cc ++ )
+        {
+        allsourcefiles[cmSystemTools::GetFilenameName(cfiles[cc])] = cfiles[cc];
+        }
+      }
+    if ( cmSystemTools::SimpleGlob(glob, cfiles, -1) )
+      {
+      for ( cc = 0; cc < cfiles.size(); cc ++ )
+        {
+        if ( cfiles[cc] != "." && cfiles[cc] != ".." )
+          {
+          cdirs.push_back(cfiles[cc]);
+          }
+        }
+      }
+    }
+
+  // find all binary files
+  cdirs.push_back(cmSystemTools::GetCurrentWorkingDirectory());
+  while ( !done ) 
+    {
+    if ( cdirs.size() <= 0 )
+      {
+      break;
+      }
+    glob = cdirs[cdirs.size()-1] + "/*";
+    //std::cout << "Glob: " << glob << std::endl;
+    cdirs.pop_back();
+    if ( cmSystemTools::SimpleGlob(glob, cfiles, 1) )
+      {
+      for ( cc = 0; cc < cfiles.size(); cc ++ )
+        {
+        allbinaryfiles[cmSystemTools::GetFilenameName(cfiles[cc])] = cfiles[cc];
+        }
+      }
+    if ( cmSystemTools::SimpleGlob(glob, cfiles, -1) )
+      {
+      for ( cc = 0; cc < cfiles.size(); cc ++ )
+        {
+        if ( cfiles[cc] != "." && cfiles[cc] != ".." )
+          {
+          cdirs.push_back(cfiles[cc]);
+          }
+        }
+      }
+    }
+
+  std::map<std::string, std::string>::iterator sit;
+  for ( sit = allbinaryfiles.begin(); sit != allbinaryfiles.end(); sit ++ )
+    {
+    const std::string& fname = sit->second;
+    //std::cout << "File: " << fname << std::endl;
+    if ( strcmp(fname.substr(fname.size()-3, 3).c_str(), ".da") == 0 )
+      {
+      files.push_back(fname);
+      }
+    }
+  
+  if ( files.size() == 0 )
+    {
+    std::cout << "Cannot find any coverage information files (.da)" << std::endl;
+    return 1;
+    }
+
+  std::ofstream log; 
+  if (!this->OpenOutputFile("Coverage", "Coverage.log", log))
+    {
+    std::cout << "Cannot open log file" << std::endl;
+    return 1;
+    }
+  log.close();
+  if (!this->OpenOutputFile("", "Coverage.xml", log))
+    {
+    std::cout << "Cannot open log file" << std::endl;
+    return 1;
+    }
+
+  std::string opath = m_ToplevelPath + "/Testing/CDart/Coverage";
+  
+  for ( cc = 0; cc < files.size(); cc ++ )
+    {
+    std::string command = "gcov -l \"" + files[cc] + "\"";
+    std::string output;
+    int retVal = 0;
+    //std::cout << "Run gcov on " << files[cc] << std::flush;
+    bool res = true;
+    if ( !m_ShowOnly )
+      {
+      res = cmSystemTools::RunCommand(command.c_str(), output, 
+                                      retVal, opath.c_str(),
+                                      m_Verbose);
+      }
+    if ( res && retVal == 0 )
+      {
+      //std::cout << " - done" << std::endl;
+      }
+    else
+      {
+      //std::cout << " - fail" << std::endl;
+      }
+    }
+  
+  files.clear();
+  glob = opath + "/*";
+  if ( !cmSystemTools::SimpleGlob(glob, cfiles, 1) )
+    {
+    std::cout << "Cannot found any coverage files" << std::endl;
+    return 1;
+    }
+  std::map<std::string, std::vector<std::string> > sourcefiles;
+  for ( cc = 0; cc < cfiles.size(); cc ++ )
+    {
+    std::string& fname = cfiles[cc];
+    //std::cout << "File: " << fname << std::endl;
+    if ( strcmp(fname.substr(fname.size()-5, 5).c_str(), ".gcov") == 0 )
+      {
+      files.push_back(fname);
+      std::string::size_type pos = fname.find(".da.");
+      if ( pos != fname.npos )
+        {
+        pos += 4;
+        std::string::size_type epos = fname.size() - pos - strlen(".gcov");
+        std::string nf = fname.substr(pos, epos);
+        //std::cout << "Substring: " << nf << std::endl;
+        if ( allsourcefiles.find(nf) != allsourcefiles.end() || 
+             allbinaryfiles.find(nf) != allbinaryfiles.end() )
+          {
+          std::vector<std::string> &cvec = sourcefiles[nf];
+          cvec.push_back(fname);
+          }
+        }
+      }
+    }
+  for ( cc = 0; cc < files.size(); cc ++ )
+    {
+    //std::cout << "File: " << files[cc] << std::endl;
+    }
+
+  std::map<std::string, std::vector<std::string> >::iterator it;
+  cmCTest::tm_CoverageMap coverageresults;
+
+  log << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+      << "<Site BuildName=\"" << m_DartConfiguration["BuildName"]
+      << "\" BuildStamp=\"" << m_CurrentTag << "-Experimental\" Name=\""
+      << m_DartConfiguration["Site"] << "\">\n"
+      << "<Coverage>\n"
+      << "\t<StartDateTime>" << start_time << "</StartDateTime>" << std::endl;
+
+  int total_tested = 0;
+  int total_untested = 0;
+
+  for ( it = sourcefiles.begin(); it != sourcefiles.end(); it ++ )
+    {
+    //std::cerr << "Source file: " << it->first << std::endl;
+    std::vector<std::string> &gfiles = it->second;
+    for ( cc = 0; cc < gfiles.size(); cc ++ )
+      {
+      //std::cout << "\t" << gfiles[cc] << std::endl;
+      std::ifstream ifile(gfiles[cc].c_str());
+      ifile.seekg (0, std::ios::end);
+      int length = ifile.tellg();
+      ifile.seekg (0, std::ios::beg);
+      char *buffer = new char [ length + 1 ];
+      ifile.read(buffer, length);
+      buffer [length] = 0;
+      //std::cout << "Read: " << buffer << std::endl;
+      std::vector<cmStdString> lines;
+      cmSystemTools::Split(buffer, lines);
+      delete [] buffer;
+      cmCTest::cmCTestCoverage& cov = coverageresults[it->first];
+      std::vector<int>& covlines = cov.m_Lines; 
+      if ( cov.m_FullPath == "" )
+        {
+        covlines.insert(covlines.begin(), lines.size(), -1);
+        if ( allsourcefiles.find(it->first) != allsourcefiles.end() )
+          {
+          cov.m_FullPath = allsourcefiles[it->first];
+          }
+        else if ( allbinaryfiles.find(it->first) != allbinaryfiles.end() )
+          {
+          cov.m_FullPath = allbinaryfiles[it->first];
+          }
+        //std::cerr << "Full path: " << cov.m_FullPath << std::endl;
+        }
+      for ( cc = 0; cc < lines.size(); cc ++ )
+        {
+        std::string& line = lines[cc];
+        std::string sub = line.substr(0, strlen("      ######"));
+        int count = atoi(sub.c_str());
+        if ( sub.compare("      ######") == 0 )
+          {
+          if ( covlines[cc] == -1 )
+            {
+            covlines[cc] = 0;
+            }
+          cov.m_UnTested ++;
+          //std::cout << "Untested - ";
+          }
+        else if ( count > 0 )
+          {
+          if ( covlines[cc] == -1 )
+            {
+            covlines[cc] = 0;
+            }
+          cov.m_Tested ++;
+          covlines[cc] += count;
+          //std::cout << "Tested[" << count << "] - ";
+          }
+
+        //std::cout << line << std::endl;
+        }
+      }
+    }
+
+  //std::cerr << "Finalizing" << std::endl;
+  cmCTest::tm_CoverageMap::iterator cit;
+  int ccount = 0;
+  std::ofstream cfileoutput; 
+  int cfileoutputcount = 0;
+  char cfileoutputname[100];
+  sprintf(cfileoutputname, "CoverageLog-%d.xml", cfileoutputcount++);
+  if (!this->OpenOutputFile("", cfileoutputname, cfileoutput))
+    {
+    std::cout << "Cannot open log file" << std::endl;
+    return 1;
+    }
+  std::string local_start_time = ::CurrentTime();
+  std::string local_end_time;
+  for ( cit = coverageresults.begin(); cit != coverageresults.end(); cit ++ )
+    {
+    if ( ccount == 100 )
+      {
+      local_end_time = ::CurrentTime();
+      cfileoutput << "\t<EndDateTime>" << local_end_time << "</EndDateTime>\n"
+                  << "</CoverageLog>\n"
+                  << "</Site>" << std::endl;
+      cfileoutput.close();
+      sprintf(cfileoutputname, "CoverageLog-%d.xml", cfileoutputcount++);
+      if (!this->OpenOutputFile("", cfileoutputname, cfileoutput))
+        {
+        std::cout << "Cannot open log file" << std::endl;
+        return 1;
+        }
+      ccount = 0;
+      }
+
+    if ( ccount == 0 )
+      {
+      local_start_time = ::CurrentTime();
+      cfileoutput << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                  << "<Site BuildName=\"" << m_DartConfiguration["BuildName"]
+                  << "\" BuildStamp=\"" << m_CurrentTag << "-Experimental\" Name=\""
+                  << m_DartConfiguration["Site"] << "\">\n"
+                  << "<CoverageLog>\n"
+                  << "\t<StartDateTime>" << local_start_time << "</StartDateTime>" << std::endl;
+      }
+
+    //std::cerr << "Final process of Source file: " << cit->first << std::endl;
+    cmCTest::cmCTestCoverage &cov = cit->second;
+
+
+    std::ifstream ifile(cov.m_FullPath.c_str());
+    ifile.seekg (0, std::ios::end);
+    int length = ifile.tellg();
+    ifile.seekg (0, std::ios::beg);
+    char *buffer = new char [ length + 1 ];
+    ifile.read(buffer, length);
+    buffer [length] = 0;
+    //std::cout << "Read: " << buffer << std::endl;
+    std::vector<cmStdString> lines;
+    cmSystemTools::Split(buffer, lines);
+    delete [] buffer;
+    cfileoutput << "\t<File Name=\"" << cit->first << "\" FullPath=\""
+                << cov.m_FullPath << std::endl << "\">\n"
+                << "\t\t<Report>" << std::endl;
+    for ( cc = 0; cc < lines.size(); cc ++ )
+      {
+      cfileoutput << "\t\t<Line Number=\"" 
+                  << static_cast<int>(cc) << "\" Count=\""
+                  << cov.m_Lines[cc] << "\">"
+                  << lines[cc] << "</Line>" << std::endl;
+      }
+    cfileoutput << "\t\t</Report>\n"
+                << "\t</File>" << std::endl;
+
+
+    total_tested += cov.m_Tested;
+    total_untested += cov.m_UnTested;
+    float cper = 0;
+    float cmet = 0;
+    if ( total_tested + total_untested > 0 )
+      {
+      cper = (100 * static_cast<float>(cov.m_Tested)/
+              static_cast<float>(cov.m_Tested + cov.m_UnTested));
+      cmet = ( static_cast<float>(cov.m_Tested + 10) /
+               static_cast<float>(cov.m_Tested + cov.m_UnTested + 10));
+      }
+    log << "\t<File Name=\"" << cit->first << "\" FullPath=\"" << cov.m_FullPath
+        << "\" Covered=\"" << cov.m_Covered << "\">\n"
+        << "\t\t<LOCTested>" << cov.m_Tested << "</LOCTested>\n"
+        << "\t\t<LOCUnTested>" << cov.m_UnTested << "</LOCUnTested>\n"
+        << "\t\t<PercentCoverage>" << cper << "</PercentCoverage>\n"
+        << "\t\t<CoverageMetric>" << cmet << "</CoverageMetric>\n"
+        << "\t</File>" << std::endl;
+    }
+  
+  if ( ccount > 0 )
+    {
+    local_end_time = ::CurrentTime();
+    cfileoutput << "\t<EndDateTime>" << local_end_time << "</EndDateTime>\n"
+                << "</CoverageLog>\n"
+                << "</Site>" << std::endl;
+    cfileoutput.close();
+    }
+
+  int total_lines = total_tested + total_untested;
+  float percent_coverage = 100 * static_cast<float>(total_tested) / 
+    static_cast<float>(total_lines);
+  if ( total_lines == 0 )
+    {
+    percent_coverage = 0;
+    }
+
+  std::string end_time = ::CurrentTime();
+
+  log << "\t<LOCTested>" << total_tested << "</LOCTested>\n"
+      << "\t<LOCUntested>" << total_untested << "</LOCUntested>\n"
+      << "\t<LOC>" << total_lines << "</LOC>\n"
+      << "\t<PercentCoverage>" << percent_coverage << "</PercentCoverage>\n"
+      << "\t<EndDateTime>" << end_time << "</EndDateTime>\n"
+      << "</Coverage>\n"
+      << "</Site>" << std::endl;
+
+  std::cout << "\tCovered LOC:         " << total_tested << std::endl
+            << "\tNot covered LOC:     " << total_untested << std::endl
+            << "\tTotal LOC:           " << total_lines << std::endl
+            << "\tPercentage Coverage: " << percent_coverage << "%" << std::endl;
+
+
+  std::cerr << "Coverage test is not yet implemented" << std::endl;
+  return 1;
+}
+
+bool cmCTest::OpenOutputFile(const std::string& path, 
+                     const std::string& name, std::ofstream& stream)
+{
+  std::string testingDir = m_ToplevelPath + "/Testing/CDart";
+  if ( path.size() > 0 )
+    {
+    testingDir += "/" + path;
+    }
+  if ( cmSystemTools::FileExists(testingDir.c_str()) )
+    {
+    if ( !cmSystemTools::FileIsDirectory(testingDir.c_str()) )
+      {
+      std::cerr << "File " << testingDir 
+                << " is in the place of the testing directory"
+                << std::endl;
+      return false;
+      }
+    }
+  else
+    {
+    if ( !cmSystemTools::MakeDirectory(testingDir.c_str()) )
+      {
+      std::cerr << "Cannot create directory " << testingDir
+                << std::endl;
+      return false;
+      }
+    }
+  std::string filename = testingDir + "/" + name;
+  stream.open(filename.c_str());
+  if( !stream )
+    {
+    return false;
+    }
+  return true;
+}
+
+void cmCTest::GenerateDartBuildOutput(std::ostream& os, 
+                                    std::vector<cmCTestBuildErrorWarning> ew)
+{
+  os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+     << "<Site BuildName=\"" << m_DartConfiguration["BuildName"]
+     << "\" BuildStamp=\"" << m_CurrentTag << "-Experimental\" Name=\""
+     << m_DartConfiguration["Site"] << "\">\n"
+     << "<Build>\n"
+     << "\t<StartDateTime>" << m_StartBuild << "</StartDateTime>\n"
+     << "<BuildCommand>" 
+     << this->MakeXMLSafe(m_DartConfiguration["MakeCommand"])
+     << "</BuildCommand>" << std::endl;
+    
+  std::vector<cmCTestBuildErrorWarning>::iterator it;
+  for ( it = ew.begin(); it != ew.end(); it++ )
+    {
+    cmCTestBuildErrorWarning *cm = &(*it);
+    os << "\t<" << (cm->m_Error ? "Error" : "Warning") << ">\n"
+       << "\t\t<BuildLogLine>" << cm->m_LogLine << "</BuildLogLine>\n"
+       << "\t\t<Text>" << this->MakeXMLSafe(cm->m_Text) 
+       << "\n</Text>" << std::endl;
+    if ( cm->m_SourceFile.size() > 0 )
+      {
+      os << "\t\t<SourceFile>" << cm->m_SourceFile << "</SourceFile>" 
+         << std::endl;
+      }
+    if ( cm->m_SourceFileTail.size() > 0 )
+      {
+      os << "\t\t<SourceFileTail>" << cm->m_SourceFileTail 
+         << "</SourceFileTail>" << std::endl;
+      }
+    if ( cm->m_LineNumber >= 0 )
+      {
+      os << "\t\t<SourceLineNumber>" << cm->m_LineNumber 
+         << "</SourceLineNumber>" << std::endl;
+      }
+    os << "\t\t<PreContext>" << this->MakeXMLSafe(cm->m_PreContext) 
+       << "</PreContext>\n"
+       << "\t\t<PostContext>" << this->MakeXMLSafe(cm->m_PostContext) 
+       << "</PostContext>\n"
+       << "\t\t<RepeatCount>0</RepeatCount>\n"
+       << "</" << (cm->m_Error ? "Error" : "Warning") << ">\n\n" 
+       << std::endl;
+    }
+  os << "\t<Log Encoding=\"base64\" Compression=\"/bin/gzip\">\n\t</Log>\n"
+     << "\t<EndDateTime>" << m_EndBuild << "</EndDateTime>\n"
+     << "</Build>\n"
+     << "</Site>" << std::endl;
+}
+  
+void cmCTest::ProcessDirectory(std::vector<std::string> &passed, 
+                             std::vector<std::string> &failed)
+{
+  // does the DartTestfile.txt exist ?
+  if(!cmSystemTools::FileExists("DartTestfile.txt"))
+    {
+    return;
+    }
+  
+  // parse the file
+  std::ifstream fin("DartTestfile.txt");
+  if(!fin)
+    {
+    return;
+    }
+
+  int firstTest = 1;
+  long line = 0;
+  
+  cmRegularExpression ireg(this->m_IncludeRegExp.c_str());
+  cmRegularExpression ereg(this->m_ExcludeRegExp.c_str());
+  cmRegularExpression dartStuff("([\t\n ]*<DartMeasurement.*/DartMeasurement[a-zA-Z]*>[\t ]*[\n]*)");
+
+  bool parseError;
+  while ( fin )
+    {
+    cmListFileFunction lff;
+    if(cmListFileCache::ParseFunction(fin, lff, "DartTestfile.txt",
+                                      parseError, line))
+      {
+      const std::string& name = lff.m_Name;
+      const std::vector<cmListFileArgument>& args = lff.m_Arguments;
+      if (name == "SUBDIRS")
+        {
+        std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
+        for(std::vector<cmListFileArgument>::const_iterator j = args.begin();
+            j != args.end(); ++j)
+          {   
+          std::string nwd = cwd + "/";
+          nwd += j->Value;
+          if (cmSystemTools::FileIsDirectory(nwd.c_str()))
+            {
+            cmSystemTools::ChangeDirectory(nwd.c_str());
+            this->ProcessDirectory(passed, failed);
+            }
+          }
+        // return to the original directory
+        cmSystemTools::ChangeDirectory(cwd.c_str());
+        }
+      
+      if (name == "ADD_TEST")
+        {
+        if (this->m_UseExcludeRegExp && 
+            this->m_UseExcludeRegExpFirst && 
+            ereg.find(args[0].Value.c_str()))
+          {
+          continue;
+          }
+        if (this->m_UseIncludeRegExp && !ireg.find(args[0].Value.c_str()))
+          {
+          continue;
+          }
+        if (this->m_UseExcludeRegExp && 
+            !this->m_UseExcludeRegExpFirst && 
+            ereg.find(args[0].Value.c_str()))
+          {
+          continue;
+          }
+
+        cmCTestTestResult cres;
+
+        if (firstTest)
+          {
+          std::string nwd = cmSystemTools::GetCurrentWorkingDirectory();
+          std::cerr << "Changing directory into " << nwd.c_str() << "\n";
+          firstTest = 0;
+          }
+        cres.m_Name = args[0].Value;
+        if ( m_ShowOnly )
+          {
+          std::cout << args[0].Value << std::endl;
+          }
+        else
+          {
+          fprintf(stderr,"Testing %-30s ",args[0].Value.c_str());
+          fflush(stderr);
+          }
+        //std::cerr << "Testing " << args[0] << " ... ";
+        // find the test executable
+        std::string testCommand = this->FindExecutable(args[1].Value.c_str());
+        testCommand = cmSystemTools::ConvertToOutputPath(testCommand.c_str());
+
+        // continue if we did not find the executable
+        if (testCommand == "")
+          {
+          std::cerr << "Unable to find executable: " << 
+            args[1].Value.c_str() << "\n";
+          continue;
+          }
+        
+        // add the arguments
+        std::vector<cmListFileArgument>::const_iterator j = args.begin();
+        ++j;
+        ++j;
+        for(;j != args.end(); ++j)
+          {   
+          testCommand += " ";
+          testCommand += cmSystemTools::EscapeSpaces(j->Value.c_str());
+          }
+        /**
+         * Run an executable command and put the stdout in output.
+         */
+        std::string output;
+        int retVal = 0;
+
+        double clock_start, clock_finish;
+        clock_start = cmSystemTools::GetTime();
+
+        if ( m_Verbose )
+          {
+          std::cout << std::endl << "Test command: " << testCommand << std::endl;
+          }
+        bool res = true;
+        if ( !m_ShowOnly )
+          {
+          res = cmSystemTools::RunCommand(testCommand.c_str(), output, 
+                                          retVal, 0, false);
+          }
+        clock_finish = cmSystemTools::GetTime();
+
+        cres.m_ExecutionTime = (double)(clock_finish - clock_start);
+        cres.m_FullCommandLine = testCommand;
+
+        if ( !m_ShowOnly )
+          {
+          if (!res || retVal != 0)
+            {
+            fprintf(stderr,"***Failed\n");
+            if (output != "")
+              {
+              if (dartStuff.find(output.c_str()))
+                {
+                cmSystemTools::ReplaceString(output,
+                                             dartStuff.match(1).c_str(),"");
+                }
+              if (output != "" && m_Verbose)
+                {
+                std::cerr << output.c_str() << "\n";
+                }
+              }
+            failed.push_back(args[0].Value); 
+            }
+          else
+            {
+            fprintf(stderr,"   Passed\n");
+            if (output != "")
+              {
+              if (dartStuff.find(output.c_str()))
+                {
+                cmSystemTools::ReplaceString(output,
+                                             dartStuff.match(1).c_str(),"");
+                }
+              if (output != "" && m_Verbose)
+                {
+                std::cerr << output.c_str() << "\n";
+                }
+              }
+            passed.push_back(args[0].Value); 
+            }
+          }
+        cres.m_Output = output;
+        cres.m_ReturnValue = retVal;
+        std::string nwd = cmSystemTools::GetCurrentWorkingDirectory();
+        if ( nwd.size() > m_ToplevelPath.size() )
+          {
+          nwd = "." + nwd.substr(m_ToplevelPath.size(), nwd.npos);
+          }
+        cres.m_Path = nwd;
+        cres.m_CompletionStatus = "Completed";
+        m_TestResults.push_back( cres );
+        }
+      }
+    }
+}
+
+int cmCTest::TestDirectory()
+{
+  std::vector<std::string> passed;
+  std::vector<std::string> failed;
+  int total;
+
+  m_StartTest = ::CurrentTime();
+  this->ProcessDirectory(passed, failed);
+  m_EndTest = ::CurrentTime();
+
+  total = int(passed.size()) + int(failed.size());
+
+  if (total == 0)
+    {
+    if ( !m_ShowOnly )
+      {
+      std::cerr << "No tests were found!!!\n";
+      }
+    }
+  else
+    {
+    if (passed.size() && (m_UseIncludeRegExp || m_UseExcludeRegExp)) 
+      {
+      std::cerr << "\nThe following tests passed:\n";
+      for(std::vector<std::string>::iterator j = passed.begin();
+          j != passed.end(); ++j)
+        {   
+        std::cerr << "\t" << *j << "\n";
+        }
+      }
+
+    float percent = float(passed.size()) * 100.0f / total;
+    fprintf(stderr,"\n%.0f%% tests passed, %i tests failed out of %i\n",
+            percent, int(failed.size()), total);
+
+    if (failed.size()) 
+      {
+      std::cerr << "\nThe following tests FAILED:\n";
+      for(std::vector<std::string>::iterator j = failed.begin();
+          j != failed.end(); ++j)
+        {   
+        std::cerr << "\t" << *j << "\n";
+        }
+      }
+    }
+
+  if ( m_DartMode )
+    {
+    std::ofstream ofs;
+    if( !this->OpenOutputFile("", "Test.xml", ofs) )
+      {
+      std::cerr << "Cannot create testing XML file" << std::endl;
+      return 1;
+      }
+    this->GenerateDartOutput(ofs);
+    }
+
+  return int(failed.size());
+}
+
+void cmCTest::GenerateDartOutput(std::ostream& os)
+{
+  if ( !m_DartMode )
+    {
+    return;
+    }
+
+  if ( m_TestResults.size() == 0 )
+    {
+    return;
+    }
+
+  os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+     << "<Site BuildName=\"" << m_DartConfiguration["BuildName"]
+     << "\" BuildStamp=\"" << m_CurrentTag << "-Experimental\" Name=\""
+     << m_DartConfiguration["Site"] << "\">\n"
+     << "<Testing>\n"
+     << "\t<StartDateTime>" << m_StartTest << "</StartDateTime>\n"
+     << "\t<TestList>\n";
+  tm_TestResultsVector::size_type cc;
+  for ( cc = 0; cc < m_TestResults.size(); cc ++ )
+    {
+    cmCTestTestResult *result = &m_TestResults[cc];
+    os << "\t\t<Test>" << this->MakeXMLSafe(result->m_Path) 
+       << "/" << this->MakeXMLSafe(result->m_Name)
+       << "</Test>" << std::endl;
+    }
+  os << "\t</TestList>\n";
+  for ( cc = 0; cc < m_TestResults.size(); cc ++ )
+    {
+    cmCTestTestResult *result = &m_TestResults[cc];
+    os << "\t<Test Status=\"" << (result->m_ReturnValue?"failed":"passed") 
+       << "\">\n"
+       << "\t\t<Name>" << this->MakeXMLSafe(result->m_Name) << "</Name>\n"
+       << "\t\t<Path>" << this->MakeXMLSafe(result->m_Path) << "</Path>\n"
+       << "\t\t<FullName>" << this->MakeXMLSafe(result->m_Path) 
+       << "/" << this->MakeXMLSafe(result->m_Name) << "</FullName>\n"
+       << "\t\t<FullCommandLine>" 
+       << this->MakeXMLSafe(result->m_FullCommandLine) 
+       << "</FullCommandLine>\n"
+       << "\t\t<Results>" << std::endl;
+    if ( result->m_ReturnValue )
+      {
+      os << "\t\t\t<NamedMeasurement type=\"text/string\" name=\"Exit Code\"><Value>"
+         << "CHILDSTATUS" << "</Value></NamedMeasurement>\n"
+         << "\t\t\t<NamedMeasurement type=\"text/string\" name=\"Exit Value\"><Value>"
+         << result->m_ReturnValue << "</Value></NamedMeasurement>" << std::endl;
+      }
+    os << "\t\t\t<NamedMeasurement type=\"numeric/double\" "
+       << "name=\"Execution Time\"><Value>"
+       << result->m_ExecutionTime << "</Value></NamedMeasurement>\n"
+       << "\t\t\t<NamedMeasurement type=\"text/string\" "
+       << "name=\"Completion Status\"><Value>"
+       << result->m_CompletionStatus << "</Value></NamedMeasurement>\n"
+       << "\t\t\t<Measurement>\n"
+       << "\t\t\t\t<Value>" << this->MakeXMLSafe(result->m_Output) 
+       << "</Value>\n"
+       << "\t\t\t</Measurement>\n"
+       << "\t\t</Results>\n"
+       << "\t</Test>" << std::endl;
+    }
+  
+  os << "\t<EndDateTime>" << m_EndTest << "</EndDateTime>\n"
+     << "</Testing>\n"
+     << "</Site>" << std::endl;
+}
+
+int cmCTest::ProcessTests()
+{
+  int res = 0;
+  bool notest = true;
+  int cc;
+
+  for ( cc = 0; cc < LAST_TEST; cc ++ )
+    {
+    if ( m_Tests[cc] )
+      {
+      notest = false;
+      break;
+      }
+    }
+  if ( m_Tests[UPDATE_TEST] || m_Tests[ALL_TEST] )
+    {
+    res += this->UpdateDirectory();
+    }
+  if ( m_Tests[CONFIGURE_TEST] || m_Tests[ALL_TEST] )
+    {
+    res += this->ConfigureDirectory();
+    }
+  if ( m_Tests[BUILD_TEST] || m_Tests[ALL_TEST] )
+    {
+    res += this->BuildDirectory();
+    }
+  if ( m_Tests[TEST_TEST] || m_Tests[ALL_TEST] || notest )
+    {
+    res += this->TestDirectory();
+    }
+  if ( m_Tests[COVERAGE_TEST] || m_Tests[ALL_TEST] )
+    {
+    this->CoverageDirectory();
+    }
+  if ( m_Tests[PURIFY_TEST] || m_Tests[ALL_TEST] )
+    {
+    std::cerr << "Purify test is not yet implemented" << std::endl;
+    }
+  return res;
+}
diff --git a/Source/ctest.h b/Source/cmCTest.h
index 635c906..9cd90bb 100644
--- a/Source/ctest.h
+++ b/Source/cmCTest.h
@@ -18,7 +18,7 @@
 
 #include "cmStandardIncludes.h"
 
-class ctest
+class cmCTest
 {
 public:
   /**
@@ -83,7 +83,7 @@ public:
   /**
    * constructor
    */
-  ctest();
+  cmCTest();
 
   bool m_UseIncludeRegExp;
   std::string m_IncludeRegExp;
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 8fce8af..cb8bc20 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -14,1466 +14,14 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "ctest.h"
-#include "cmRegularExpression.h"
+#include "cmCTest.h"
 #include "cmSystemTools.h"
-#include "cmListFileCache.h"
 
-#include <stdio.h>
-#include <time.h>
-
-static std::string CleanString(std::string str)
-{
-  std::string::size_type spos = str.find_first_not_of(" \n\t");
-  std::string::size_type epos = str.find_last_not_of(" \n\t");
-  if ( spos == str.npos )
-    {
-    return std::string();
-    }
-  if ( epos != str.npos )
-    {
-    epos = epos - spos + 1;
-    }
-  return str.substr(spos, epos);
-}
-
-static std::string CurrentTime()
-{
-  time_t currenttime = time(0);
-  return ::CleanString(ctime(&currenttime));
-}
-
-static const char* cmCTestErrorMatches[] = {
-  "^[Bb]us [Ee]rror",
-  "^[Ss]egmentation [Vv]iolation",
-  "^[Ss]egmentation [Ff]ault",
-  "([^ :]+):([0-9]+): ([^ \\t])",
-  "([^:]+): error[ \\t]*[0-9]+[ \\t]*:",
-  "^Error ([0-9]+):",
-  "^Error ",
-  "^\"[^\"]+\", line [0-9]+: [^Ww]",
-  "^cc[^C]*CC: ERROR File = ([^,]+), Line = ([0-9]+)",
-  "^ld([^:])*:([ \\t])*ERROR([^:])*:",
-  "^ild:([ \\t])*\\(undefined symbol\\)",
-  "([^ :]+) : (error|fatal error|catastrophic error)",
-  "([^:]+): (Error:|error|undefined reference|multiply defined)",
-  "([^:]+)\\(([^\\)]+)\\) : (error|fatal error|catastrophic error)",
-  "^fatal error C[0-9]+:",
-  ": syntax error ",
-  "^collect2: ld returned 1 exit status",
-  "Unsatisfied symbols:",
-  "Undefined symbols:",
-  "^Undefined[ \\t]+first referenced",
-  "^CMake Error:",
-  ":[ \\t]cannot find",
-  0
-};
-
-static const char* cmCTestErrorExceptions[] = {
-  0
-};
-
-static const char* cmCTestWarningMatches[] = {
-  "([^ :]+):([0-9]+): warning:",
-  "^cc[^C]*CC: WARNING File = ([^,]+), Line = ([0-9]+)",
-  "^ld([^:])*:([ \\t])*WARNING([^:])*:",
-  "([^:]+): warning ([0-9]+):",
-  "^\"[^\"]+\", line [0-9]+: [Ww]arning",
-  "([^:]+): warning[ \\t]*[0-9]+[ \\t]*:",
-  "^Warning ([0-9]+):",
-  "^Warning ",
-  "([^ :]+) : warning",
-  "([^:]+): warning",
-  0
-};
-
-static const char* cmCTestWarningExceptions[] = {
-  "/usr/openwin/include/X11/Xlib\\.h:[0-9]+: warning: ANSI C\\+\\+ forbids declaration",
-  "/usr/openwin/include/X11/Xutil\\.h:[0-9]+: warning: ANSI C\\+\\+ forbids declaration",
-  "/usr/openwin/include/X11/XResource\\.h:[0-9]+: warning: ANSI C\\+\\+ forbids declaration",
-  "WARNING 84 :",
-  "WARNING 47 :",
-  "makefile:",
-  "Makefile:",
-  "warning:  Clock skew detected.  Your build may be incomplete.",
-  "/usr/openwin/include/GL/[^:]+:",
-  "bind_at_load",
-  "XrmQGetResource",
-  "IceFlush",
-  "warning LNK4089: all references to .GDI32.dll. discarded by .OPT:REF",
-  "warning LNK4089: all references to .USER32.dll. discarded by .OPT:REF",
-  "ld32: WARNING 85: definition of dataKey in",
-  0
-};
-
-std::string ctest::MakeXMLSafe(const std::string& str)
-{
-  std::string::size_type pos = 0;
-  cmOStringStream ost;
-  char buffer[10];
-  for ( pos = 0; pos < str.size(); pos ++ )
-    {
-    char ch = str[pos];
-    if ( ch > 126 )
-      {
-      sprintf(buffer, "&%x", (int)ch);
-      ost << buffer;
-      }
-    else
-      {
-      switch ( ch )
-        {
-        case '&': ost << "&amp;"; break;
-        case '<': ost << "&lt;"; break;
-        case '>': ost << "&gt;"; break;
-        default: ost << ch;
-        }
-      }
-    }
-  return ost.str();
-}
-
-bool TryExecutable(const char *dir, const char *file,
-                   std::string *fullPath, const char *subdir)
-{
-  // try current directory
-  std::string tryPath;
-  if (dir && strcmp(dir,""))
-    {
-    tryPath = dir;
-    tryPath += "/";
-    }
-  
-  if (subdir && strcmp(subdir,""))
-    {
-    tryPath += subdir;
-    tryPath += "/";
-    }
-  
-  tryPath += file;
-  if(cmSystemTools::FileExists(tryPath.c_str()))
-    {
-    *fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
-    return true;
-    }
-  tryPath += cmSystemTools::GetExecutableExtension();
-  if(cmSystemTools::FileExists(tryPath.c_str()))
-    {
-    *fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
-    return true;
-    }
-  return false;
-}
-
-ctest::ctest() 
-{ 
-  m_UseIncludeRegExp      = false;
-  m_UseExcludeRegExp      = false;
-  m_UseExcludeRegExpFirst = false;
-  m_Verbose               = false;
-  m_DartMode              = false;
-  m_ShowOnly              = false;
-  int cc; 
-  for ( cc=0; cc < ctest::LAST_TEST; cc ++ )
-    {
-    m_Tests[cc] = 0;
-    }
-}
-
-void ctest::Initialize()
-{
-  m_ToplevelPath = cmSystemTools::GetCurrentWorkingDirectory();
-  // parse the dart test file
-  std::ifstream fin("DartConfiguration.tcl");
-  if(!fin)
-    {
-    return;
-    }
-
-  char buffer[1024];
-  while ( fin )
-    {
-    buffer[0] = 0;
-    fin.getline(buffer, 1023);
-    buffer[1023] = 0;
-    std::string line = ::CleanString(buffer);
-    if(line.size() == 0)
-      {
-      continue;
-      }
-    while ( fin && (line[line.size()-1] == '\\') )
-      {
-      line = line.substr(0, line.size()-1);
-      buffer[0] = 0;
-      fin.getline(buffer, 1023);
-      buffer[1023] = 0;
-      line += ::CleanString(buffer);
-      }
-    if ( line[0] == '#' )
-      {
-      continue;
-      }
-    std::string::size_type cpos = line.find_first_of(":");
-    if ( cpos == line.npos )
-      {
-      continue;
-      }
-    std::string key = line.substr(0, cpos);
-    std::string value = ::CleanString(line.substr(cpos+1, line.npos));
-    m_DartConfiguration[key] = value;
-    }
-  fin.close();
-  if ( m_DartMode )
-    {
-    std::string testingDir = m_ToplevelPath + "/Testing/CDart";
-    if ( cmSystemTools::FileExists(testingDir.c_str()) )
-      {
-      if ( !cmSystemTools::FileIsDirectory(testingDir.c_str()) )
-        {
-        std::cerr << "File " << testingDir << " is in the place of the testing directory"
-                  << std::endl;
-        return;
-        }
-      }
-    else
-      {
-      if ( !cmSystemTools::MakeDirectory(testingDir.c_str()) )
-        {
-        std::cerr << "Cannot create directory " << testingDir
-                  << std::endl;
-        return;
-        }
-      }
-    std::string tagfile = testingDir + "/TAG";
-    std::ifstream tfin(tagfile.c_str());
-    std::string tag;
-    time_t tctime = time(0);
-    struct tm *lctime = gmtime(&tctime);
-    if ( tfin )
-      {
-      tfin >> tag;
-      tfin.close();
-      int year = 0;
-      int mon = 0;
-      int day = 0;
-      int hour = 0;
-      int min = 0;
-      sscanf(tag.c_str(), "%04d%02d%02d-%02d%02d",
-             &year, &mon, &day, &hour, &min);
-      if ( year != lctime->tm_year + 1900 ||
-           mon != lctime->tm_mon ||
-           day != lctime->tm_mday )
-        {
-        tag = "";
-        }
-
-      }
-    if ( tag.size() == 0 )
-      {
-      char datestring[100];
-      sprintf(datestring, "%04d%02d%02d-%02d%02d",
-              lctime->tm_year + 1900,
-              lctime->tm_mon,
-              lctime->tm_mday,
-              lctime->tm_hour,
-              lctime->tm_min);
-      tag = datestring;
-      std::ofstream ofs(tagfile.c_str());
-      if ( ofs )
-        {
-        ofs << tag << std::endl;
-        }
-      ofs.close();
-      std::cout << "Create new tag: " << tag << std::endl;
-      }
-    m_CurrentTag = tag;
-    }
-}
-
-bool ctest::SetTest(const char* ttype)
-{
-  if ( cmSystemTools::LowerCase(ttype) == "all" )
-    {
-    m_Tests[ctest::ALL_TEST] = 1;
-    }
-  else if ( cmSystemTools::LowerCase(ttype) == "update" )
-    {
-    m_Tests[ctest::UPDATE_TEST] = 1;
-    }
-  else if ( cmSystemTools::LowerCase(ttype) == "configure" )
-    {
-    m_Tests[ctest::CONFIGURE_TEST] = 1;
-    }
-  else if ( cmSystemTools::LowerCase(ttype) == "build" )
-    {
-    m_Tests[ctest::BUILD_TEST] = 1;
-    }
-  else if ( cmSystemTools::LowerCase(ttype) == "test" )
-    {
-    m_Tests[ctest::TEST_TEST] = 1;
-    }
-  else if ( cmSystemTools::LowerCase(ttype) == "coverage" )
-    {
-    m_Tests[ctest::COVERAGE_TEST] = 1;
-    }
-  else if ( cmSystemTools::LowerCase(ttype) == "purify" )
-    {
-    m_Tests[ctest::PURIFY_TEST] = 1;
-    }
-  else
-    {
-    std::cerr << "Don't know about test \"" << ttype << "\" yet..." << std::endl;
-    return false;
-    }
-  return true;
-}
-
-void ctest::Finalize()
-{
-}
-
-std::string ctest::FindExecutable(const char *exe)
-{
-  std::string fullPath = "";
-  std::string dir;
-  std::string file;
-
-  cmSystemTools::SplitProgramPath(exe, dir, file);
-  if(m_ConfigType != "")
-    {
-    if(TryExecutable(dir.c_str(), file.c_str(), &fullPath, 
-                     m_ConfigType.c_str()))
-      {
-      return fullPath;
-      }
-    dir += "/";
-    dir += m_ConfigType;
-    dir += "/";
-    dir += file;
-    cmSystemTools::Error("config type specified on the command line, but test executable not found.",
-                         dir.c_str());
-    return "";
-    }
-  if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"."))
-    {
-    return fullPath;
-    }
-
-  if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,""))
-    {
-    return fullPath;
-    }
-
-  if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Release"))
-    {
-    return fullPath;
-    }
-
-  if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"Debug"))
-    {
-    return fullPath;
-    }
-
-  if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"MinSizeRel"))
-    {
-    return fullPath;
-    }
-
-  if (TryExecutable(dir.c_str(),file.c_str(),&fullPath,"RelWithDebInfo"))
-    {
-    return fullPath;
-    }
-
-  // if everything else failed, check the users path
-  if (dir != "")
-    {
-    std::string path = cmSystemTools::FindProgram(file.c_str());
-    if (path != "")
-      {
-      return path;
-      }
-    }
-  
-  return fullPath;
-}
-
-int ctest::UpdateDirectory()
-{
-  std::string cvsCommand = m_DartConfiguration["CVSCommand"];
-  if ( cvsCommand.size() == 0 )
-    {
-    std::cerr << "Cannot find CVSCommand key in the DartConfiguration.tcl" << std::endl;
-    return 1;
-    }
-  std::string cvsOptions = m_DartConfiguration["CVSUpdateOptions"];
-  if ( cvsOptions.size() == 0 )
-    {
-    std::cerr << "Cannot find CVSUpdateOptions key in the DartConfiguration.tcl" << std::endl;
-    return 1;
-    }
-
-  std::string sourceDirectory = m_DartConfiguration["SourceDirectory"];
-  if ( sourceDirectory.size() == 0 )
-    {
-    std::cerr << "Cannot find SourceDirectory  key in the DartConfiguration.tcl" << std::endl;
-    return 1;
-    }
-
-  std::string command = cvsCommand + " update " + cvsOptions;
-
-  std::string output;
-  int retVal = 0;
-  bool res = true;
-  if ( !m_ShowOnly )
-    {
-    res = cmSystemTools::RunCommand(command.c_str(), output, 
-                                    retVal, sourceDirectory.c_str(),
-                                    m_Verbose);
-    }
-  else
-    {
-    std::cout << "Update with command: " << command << std::endl;
-    }
-  if (! res || retVal )
-    {
-    std::cerr << "Error(s) when updating the project" << std::endl;
-    return 1;
-    }
-  return 0;
-}
-
-int ctest::ConfigureDirectory()
-{
-  std::string cCommand = m_DartConfiguration["ConfigureCommand"];
-  if ( cCommand.size() == 0 )
-    {
-    std::cerr << "Cannot find ConfigureCommand key in the DartConfiguration.tcl" 
-              << std::endl;
-    return 1;
-    }
-
-  std::string buildDirectory = m_DartConfiguration["BuildDirectory"];
-  if ( buildDirectory.size() == 0 )
-    {
-    std::cerr << "Cannot find BuildDirectory  key in the DartConfiguration.tcl" << std::endl;
-    return 1;
-    }
-
-  std::string output;
-  int retVal = 0;
-  bool res = true;
-  if ( !m_ShowOnly )
-    {
-    res = cmSystemTools::RunCommand(cCommand.c_str(), output, 
-                                    retVal, buildDirectory.c_str(),
-                                    m_Verbose);
-    }
-  else
-    {
-    std::cout << "Configure with command: " << cCommand << std::endl;
-    }
-  if (! res || retVal )
-    {
-    std::cerr << "Error(s) when updating the project" << std::endl;
-    return 1;
-    }
-  return 0;
-}
-
-int ctest::BuildDirectory()
-{
-  std::string makeCommand = m_DartConfiguration["MakeCommand"];
-  if ( makeCommand.size() == 0 )
-    {
-    std::cerr << "Cannot find MakeCommand key in the DartConfiguration.tcl" << std::endl;
-    return 1;
-    }
-  std::string buildDirectory = m_DartConfiguration["BuildDirectory"];
-  if ( buildDirectory.size() == 0 )
-    {
-    std::cerr << "Cannot find BuildDirectory  key in the DartConfiguration.tcl" << std::endl;
-    return 1;
-    }
-
-  m_StartBuild = ::CurrentTime();
-  std::string output;
-  int retVal = 0;
-  bool res = true;
-  if ( !m_ShowOnly )
-    {
-    res = cmSystemTools::RunCommand(makeCommand.c_str(), output, 
-                                    retVal, buildDirectory.c_str(), 
-                                    m_Verbose);
-    }
-  else
-    {
-    std::cout << "Build with command: " << makeCommand << std::endl;
-    }
-  m_EndBuild = ::CurrentTime();
-  if (! res || retVal )
-    {
-    std::cerr << "Error(s) when building project" << std::endl;
-    }
-
-  // Parsing of output for errors and warnings.
-
-  std::vector<cmStdString> lines;
-  cmSystemTools::Split(output.c_str(), lines);
-
-  std::ofstream ofs;
-  if ( this->OpenOutputFile("Temporary", "LastBuild.log", ofs) )
-    {
-    ofs << output;
-    ofs.close();
-    }
-  else
-    {
-    std::cerr << "Cannot create LastBuild.log file" << std::endl;    
-    }
-  
-  // Lines are marked: 
-  // 0 - nothing
-  // 1 - error
-  // > 1 - warning
-  std::vector<int> markedLines(lines.size(), 0);
-  
-  int cc;
-  // Errors
-  for ( cc = 0; cmCTestErrorMatches[cc]; cc ++ )
-    {
-    cmRegularExpression re(cmCTestErrorMatches[cc]);
-    std::vector<std::string>::size_type kk;
-    for ( kk = 0; kk < lines.size(); kk ++ )
-      {
-      if ( re.find(lines[kk]) )
-        {
-        markedLines[kk] = 1;
-        }
-      }    
-    }
-  // Warnings
-  for ( cc = 0; cmCTestWarningMatches[cc]; cc ++ )
-    {
-    cmRegularExpression re(cmCTestWarningMatches[cc]);
-    std::vector<std::string>::size_type kk;
-    for ( kk = 0; kk < lines.size(); kk ++ )
-      {
-      if ( re.find(lines[kk]) )
-        {
-        markedLines[kk] += 2;
-        }
-      }    
-    }
-  // Errors exceptions
-  for ( cc = 0; cmCTestErrorExceptions[cc]; cc ++ )
-    {
-    cmRegularExpression re(cmCTestErrorExceptions[cc]);
-    std::vector<int>::size_type kk;
-    for ( kk =0; kk < markedLines.size(); kk ++ )
-      {
-      if ( markedLines[cc] == 1 )
-        {
-        if ( re.find(lines[kk]) )
-          {
-          markedLines[cc] = 0;
-          }
-        }
-      }
-    }
-  // Warning exceptions
-  for ( cc = 0; cmCTestWarningExceptions[cc]; cc ++ )
-    {
-    cmRegularExpression re(cmCTestWarningExceptions[cc]);
-    std::vector<int>::size_type kk;
-    for ( kk =0; kk < markedLines.size(); kk ++ )
-      {
-      if ( markedLines[cc] > 1 )
-        {
-        if ( re.find(lines[kk]) )
-          {
-          markedLines[cc] = 0;
-          }
-        }
-      }
-    }
-  std::vector<cmCTestBuildErrorWarning> errorsWarnings;
-
-  std::vector<int>::size_type kk;
-  cmCTestBuildErrorWarning errorwarning;
-  for ( kk =0; kk < markedLines.size(); kk ++ )
-    {
-    errorwarning.m_LineNumber = -1;
-    bool found = false;
-    if ( markedLines[kk] == 1 )
-      {
-      std::cout << "Error: " << lines[kk] << std::endl;
-      errorwarning.m_Error = true;
-      found = true;
-      }
-    else if ( markedLines[kk] > 1 )
-      {
-      std::cout << "Warning: " << lines[kk] << std::endl;
-      errorwarning.m_Error = false;
-      found = true;
-      }
-    if ( found )
-      {
-      errorwarning.m_LogLine     = static_cast<int>(kk+1);
-      errorwarning.m_Text        = lines[kk];
-      errorwarning.m_PreContext  = "";
-      errorwarning.m_PostContext = "";
-      std::vector<int>::size_type jj;
-      std::vector<int>::size_type ll = 0;
-      if ( kk > 6 )
-        {
-        ll = kk - 6;
-        }
-      for ( jj = kk; 
-            jj > 0 && jj > ll /* && markedLines[jj] == 0 */; 
-            jj -- );
-      for (; jj < kk; jj ++ )
-        {
-        errorwarning.m_PreContext += lines[jj] + "\n";
-        }
-      for ( jj = kk+1; 
-            jj < lines.size() && jj < kk + 7 /* && markedLines[jj] == 0*/; 
-            jj ++ )
-        {
-        errorwarning.m_PostContext += lines[jj] + "\n";
-        }
-      errorsWarnings.push_back(errorwarning);
-      }
-    }
-
-  if( !this->OpenOutputFile("", "Build.xml", ofs) )
-    {
-    std::cerr << "Cannot create build XML file" << std::endl;
-    return 1;
-    }
-  this->GenerateDartBuildOutput(ofs, errorsWarnings);
-  return 0;
-}
- 
-int ctest::CoverageDirectory()
-{
-  std::vector<std::string> files;
-  std::vector<std::string> cfiles;
-  std::vector<std::string> cdirs;
-  bool done = false;
-  std::string::size_type cc;
-  std::string glob;
-  std::map<std::string, std::string> allsourcefiles;
-  std::map<std::string, std::string> allbinaryfiles;
-
-  std::string start_time = ::CurrentTime();
-
-  // Find all source files.
-  std::string sourceDirectory = m_DartConfiguration["SourceDirectory"];
-  if ( sourceDirectory.size() == 0 )
-    {
-    std::cerr << "Cannot find SourceDirectory  key in the DartConfiguration.tcl" << std::endl;
-    return 1;
-    }
-  cdirs.push_back(sourceDirectory);
-  while ( !done ) 
-    {
-    if ( cdirs.size() <= 0 )
-      {
-      break;
-      }
-    glob = cdirs[cdirs.size()-1] + "/*";
-    //std::cout << "Glob: " << glob << std::endl;
-    cdirs.pop_back();
-    if ( cmSystemTools::SimpleGlob(glob, cfiles, 1) )
-      {
-      for ( cc = 0; cc < cfiles.size(); cc ++ )
-        {
-        allsourcefiles[cmSystemTools::GetFilenameName(cfiles[cc])] = cfiles[cc];
-        }
-      }
-    if ( cmSystemTools::SimpleGlob(glob, cfiles, -1) )
-      {
-      for ( cc = 0; cc < cfiles.size(); cc ++ )
-        {
-        if ( cfiles[cc] != "." && cfiles[cc] != ".." )
-          {
-          cdirs.push_back(cfiles[cc]);
-          }
-        }
-      }
-    }
-
-  // find all binary files
-  cdirs.push_back(cmSystemTools::GetCurrentWorkingDirectory());
-  while ( !done ) 
-    {
-    if ( cdirs.size() <= 0 )
-      {
-      break;
-      }
-    glob = cdirs[cdirs.size()-1] + "/*";
-    //std::cout << "Glob: " << glob << std::endl;
-    cdirs.pop_back();
-    if ( cmSystemTools::SimpleGlob(glob, cfiles, 1) )
-      {
-      for ( cc = 0; cc < cfiles.size(); cc ++ )
-        {
-        allbinaryfiles[cmSystemTools::GetFilenameName(cfiles[cc])] = cfiles[cc];
-        }
-      }
-    if ( cmSystemTools::SimpleGlob(glob, cfiles, -1) )
-      {
-      for ( cc = 0; cc < cfiles.size(); cc ++ )
-        {
-        if ( cfiles[cc] != "." && cfiles[cc] != ".." )
-          {
-          cdirs.push_back(cfiles[cc]);
-          }
-        }
-      }
-    }
-
-  std::map<std::string, std::string>::iterator sit;
-  for ( sit = allbinaryfiles.begin(); sit != allbinaryfiles.end(); sit ++ )
-    {
-    const std::string& fname = sit->second;
-    //std::cout << "File: " << fname << std::endl;
-    if ( strcmp(fname.substr(fname.size()-3, 3).c_str(), ".da") == 0 )
-      {
-      files.push_back(fname);
-      }
-    }
-  
-  if ( files.size() == 0 )
-    {
-    std::cout << "Cannot find any coverage information files (.da)" << std::endl;
-    return 1;
-    }
-
-  std::ofstream log; 
-  if (!this->OpenOutputFile("Coverage", "Coverage.log", log))
-    {
-    std::cout << "Cannot open log file" << std::endl;
-    return 1;
-    }
-  log.close();
-  if (!this->OpenOutputFile("", "Coverage.xml", log))
-    {
-    std::cout << "Cannot open log file" << std::endl;
-    return 1;
-    }
-
-  std::string opath = m_ToplevelPath + "/Testing/CDart/Coverage";
-  
-  for ( cc = 0; cc < files.size(); cc ++ )
-    {
-    std::string command = "gcov -l \"" + files[cc] + "\"";
-    std::string output;
-    int retVal = 0;
-    //std::cout << "Run gcov on " << files[cc] << std::flush;
-    bool res = true;
-    if ( !m_ShowOnly )
-      {
-      res = cmSystemTools::RunCommand(command.c_str(), output, 
-                                      retVal, opath.c_str(),
-                                      m_Verbose);
-      }
-    if ( res && retVal == 0 )
-      {
-      //std::cout << " - done" << std::endl;
-      }
-    else
-      {
-      //std::cout << " - fail" << std::endl;
-      }
-    }
-  
-  files.clear();
-  glob = opath + "/*";
-  if ( !cmSystemTools::SimpleGlob(glob, cfiles, 1) )
-    {
-    std::cout << "Cannot found any coverage files" << std::endl;
-    return 1;
-    }
-  std::map<std::string, std::vector<std::string> > sourcefiles;
-  for ( cc = 0; cc < cfiles.size(); cc ++ )
-    {
-    std::string& fname = cfiles[cc];
-    //std::cout << "File: " << fname << std::endl;
-    if ( strcmp(fname.substr(fname.size()-5, 5).c_str(), ".gcov") == 0 )
-      {
-      files.push_back(fname);
-      std::string::size_type pos = fname.find(".da.");
-      if ( pos != fname.npos )
-        {
-        pos += 4;
-        std::string::size_type epos = fname.size() - pos - strlen(".gcov");
-        std::string nf = fname.substr(pos, epos);
-        //std::cout << "Substring: " << nf << std::endl;
-        if ( allsourcefiles.find(nf) != allsourcefiles.end() || 
-             allbinaryfiles.find(nf) != allbinaryfiles.end() )
-          {
-          std::vector<std::string> &cvec = sourcefiles[nf];
-          cvec.push_back(fname);
-          }
-        }
-      }
-    }
-  for ( cc = 0; cc < files.size(); cc ++ )
-    {
-    //std::cout << "File: " << files[cc] << std::endl;
-    }
-
-  std::map<std::string, std::vector<std::string> >::iterator it;
-  ctest::tm_CoverageMap coverageresults;
-
-  log << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-      << "<Site BuildName=\"" << m_DartConfiguration["BuildName"]
-      << "\" BuildStamp=\"" << m_CurrentTag << "-Experimental\" Name=\""
-      << m_DartConfiguration["Site"] << "\">\n"
-      << "<Coverage>\n"
-      << "\t<StartDateTime>" << start_time << "</StartDateTime>" << std::endl;
-
-  int total_tested = 0;
-  int total_untested = 0;
-
-  for ( it = sourcefiles.begin(); it != sourcefiles.end(); it ++ )
-    {
-    //std::cerr << "Source file: " << it->first << std::endl;
-    std::vector<std::string> &gfiles = it->second;
-    for ( cc = 0; cc < gfiles.size(); cc ++ )
-      {
-      //std::cout << "\t" << gfiles[cc] << std::endl;
-      std::ifstream ifile(gfiles[cc].c_str());
-      ifile.seekg (0, std::ios::end);
-      int length = ifile.tellg();
-      ifile.seekg (0, std::ios::beg);
-      char *buffer = new char [ length + 1 ];
-      ifile.read(buffer, length);
-      buffer [length] = 0;
-      //std::cout << "Read: " << buffer << std::endl;
-      std::vector<cmStdString> lines;
-      cmSystemTools::Split(buffer, lines);
-      delete [] buffer;
-      ctest::cmCTestCoverage& cov = coverageresults[it->first];
-      std::vector<int>& covlines = cov.m_Lines; 
-      if ( cov.m_FullPath == "" )
-        {
-        covlines.insert(covlines.begin(), lines.size(), -1);
-        if ( allsourcefiles.find(it->first) != allsourcefiles.end() )
-          {
-          cov.m_FullPath = allsourcefiles[it->first];
-          }
-        else if ( allbinaryfiles.find(it->first) != allbinaryfiles.end() )
-          {
-          cov.m_FullPath = allbinaryfiles[it->first];
-          }
-        //std::cerr << "Full path: " << cov.m_FullPath << std::endl;
-        }
-      for ( cc = 0; cc < lines.size(); cc ++ )
-        {
-        std::string& line = lines[cc];
-        std::string sub = line.substr(0, strlen("      ######"));
-        int count = atoi(sub.c_str());
-        if ( sub.compare("      ######") == 0 )
-          {
-          if ( covlines[cc] == -1 )
-            {
-            covlines[cc] = 0;
-            }
-          cov.m_UnTested ++;
-          //std::cout << "Untested - ";
-          }
-        else if ( count > 0 )
-          {
-          if ( covlines[cc] == -1 )
-            {
-            covlines[cc] = 0;
-            }
-          cov.m_Tested ++;
-          covlines[cc] += count;
-          //std::cout << "Tested[" << count << "] - ";
-          }
-
-        //std::cout << line << std::endl;
-        }
-      }
-    }
-
-  //std::cerr << "Finalizing" << std::endl;
-  ctest::tm_CoverageMap::iterator cit;
-  int ccount = 0;
-  std::ofstream cfileoutput; 
-  int cfileoutputcount = 0;
-  char cfileoutputname[100];
-  sprintf(cfileoutputname, "CoverageLog-%d.xml", cfileoutputcount++);
-  if (!this->OpenOutputFile("", cfileoutputname, cfileoutput))
-    {
-    std::cout << "Cannot open log file" << std::endl;
-    return 1;
-    }
-  std::string local_start_time = ::CurrentTime();
-  std::string local_end_time;
-  for ( cit = coverageresults.begin(); cit != coverageresults.end(); cit ++ )
-    {
-    if ( ccount == 100 )
-      {
-      local_end_time = ::CurrentTime();
-      cfileoutput << "\t<EndDateTime>" << local_end_time << "</EndDateTime>\n"
-                  << "</CoverageLog>\n"
-                  << "</Site>" << std::endl;
-      cfileoutput.close();
-      sprintf(cfileoutputname, "CoverageLog-%d.xml", cfileoutputcount++);
-      if (!this->OpenOutputFile("", cfileoutputname, cfileoutput))
-        {
-        std::cout << "Cannot open log file" << std::endl;
-        return 1;
-        }
-      ccount = 0;
-      }
-
-    if ( ccount == 0 )
-      {
-      local_start_time = ::CurrentTime();
-      cfileoutput << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                  << "<Site BuildName=\"" << m_DartConfiguration["BuildName"]
-                  << "\" BuildStamp=\"" << m_CurrentTag << "-Experimental\" Name=\""
-                  << m_DartConfiguration["Site"] << "\">\n"
-                  << "<CoverageLog>\n"
-                  << "\t<StartDateTime>" << local_start_time << "</StartDateTime>" << std::endl;
-      }
-
-    //std::cerr << "Final process of Source file: " << cit->first << std::endl;
-    ctest::cmCTestCoverage &cov = cit->second;
-
-
-    std::ifstream ifile(cov.m_FullPath.c_str());
-    ifile.seekg (0, std::ios::end);
-    int length = ifile.tellg();
-    ifile.seekg (0, std::ios::beg);
-    char *buffer = new char [ length + 1 ];
-    ifile.read(buffer, length);
-    buffer [length] = 0;
-    //std::cout << "Read: " << buffer << std::endl;
-    std::vector<cmStdString> lines;
-    cmSystemTools::Split(buffer, lines);
-    delete [] buffer;
-    cfileoutput << "\t<File Name=\"" << cit->first << "\" FullPath=\""
-                << cov.m_FullPath << std::endl << "\">\n"
-                << "\t\t<Report>" << std::endl;
-    for ( cc = 0; cc < lines.size(); cc ++ )
-      {
-      cfileoutput << "\t\t<Line Number=\"" 
-                  << static_cast<int>(cc) << "\" Count=\""
-                  << cov.m_Lines[cc] << "\">"
-                  << lines[cc] << "</Line>" << std::endl;
-      }
-    cfileoutput << "\t\t</Report>\n"
-                << "\t</File>" << std::endl;
-
-
-    total_tested += cov.m_Tested;
-    total_untested += cov.m_UnTested;
-    float cper = 0;
-    float cmet = 0;
-    if ( total_tested + total_untested > 0 )
-      {
-      cper = (100 * static_cast<float>(cov.m_Tested)/
-              static_cast<float>(cov.m_Tested + cov.m_UnTested));
-      cmet = ( static_cast<float>(cov.m_Tested + 10) /
-               static_cast<float>(cov.m_Tested + cov.m_UnTested + 10));
-      }
-    log << "\t<File Name=\"" << cit->first << "\" FullPath=\"" << cov.m_FullPath
-        << "\" Covered=\"" << cov.m_Covered << "\">\n"
-        << "\t\t<LOCTested>" << cov.m_Tested << "</LOCTested>\n"
-        << "\t\t<LOCUnTested>" << cov.m_UnTested << "</LOCUnTested>\n"
-        << "\t\t<PercentCoverage>" << cper << "</PercentCoverage>\n"
-        << "\t\t<CoverageMetric>" << cmet << "</CoverageMetric>\n"
-        << "\t</File>" << std::endl;
-    }
-  
-  if ( ccount > 0 )
-    {
-    local_end_time = ::CurrentTime();
-    cfileoutput << "\t<EndDateTime>" << local_end_time << "</EndDateTime>\n"
-                << "</CoverageLog>\n"
-                << "</Site>" << std::endl;
-    cfileoutput.close();
-    }
-
-  int total_lines = total_tested + total_untested;
-  float percent_coverage = 100 * static_cast<float>(total_tested) / 
-    static_cast<float>(total_lines);
-  if ( total_lines == 0 )
-    {
-    percent_coverage = 0;
-    }
-
-  std::string end_time = ::CurrentTime();
-
-  log << "\t<LOCTested>" << total_tested << "</LOCTested>\n"
-      << "\t<LOCUntested>" << total_untested << "</LOCUntested>\n"
-      << "\t<LOC>" << total_lines << "</LOC>\n"
-      << "\t<PercentCoverage>" << percent_coverage << "</PercentCoverage>\n"
-      << "\t<EndDateTime>" << end_time << "</EndDateTime>\n"
-      << "</Coverage>\n"
-      << "</Site>" << std::endl;
-
-  std::cout << "\tCovered LOC:         " << total_tested << std::endl
-            << "\tNot covered LOC:     " << total_untested << std::endl
-            << "\tTotal LOC:           " << total_lines << std::endl
-            << "\tPercentage Coverage: " << percent_coverage << "%" << std::endl;
-
-
-  std::cerr << "Coverage test is not yet implemented" << std::endl;
-  return 1;
-}
-
-bool ctest::OpenOutputFile(const std::string& path, 
-                     const std::string& name, std::ofstream& stream)
-{
-  std::string testingDir = m_ToplevelPath + "/Testing/CDart";
-  if ( path.size() > 0 )
-    {
-    testingDir += "/" + path;
-    }
-  if ( cmSystemTools::FileExists(testingDir.c_str()) )
-    {
-    if ( !cmSystemTools::FileIsDirectory(testingDir.c_str()) )
-      {
-      std::cerr << "File " << testingDir 
-                << " is in the place of the testing directory"
-                << std::endl;
-      return false;
-      }
-    }
-  else
-    {
-    if ( !cmSystemTools::MakeDirectory(testingDir.c_str()) )
-      {
-      std::cerr << "Cannot create directory " << testingDir
-                << std::endl;
-      return false;
-      }
-    }
-  std::string filename = testingDir + "/" + name;
-  stream.open(filename.c_str());
-  if( !stream )
-    {
-    return false;
-    }
-  return true;
-}
-
-void ctest::GenerateDartBuildOutput(std::ostream& os, 
-                                    std::vector<cmCTestBuildErrorWarning> ew)
-{
-  os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-     << "<Site BuildName=\"" << m_DartConfiguration["BuildName"]
-     << "\" BuildStamp=\"" << m_CurrentTag << "-Experimental\" Name=\""
-     << m_DartConfiguration["Site"] << "\">\n"
-     << "<Build>\n"
-     << "\t<StartDateTime>" << m_StartBuild << "</StartDateTime>\n"
-     << "<BuildCommand>" 
-     << this->MakeXMLSafe(m_DartConfiguration["MakeCommand"])
-     << "</BuildCommand>" << std::endl;
-    
-  std::vector<cmCTestBuildErrorWarning>::iterator it;
-  for ( it = ew.begin(); it != ew.end(); it++ )
-    {
-    cmCTestBuildErrorWarning *cm = &(*it);
-    os << "\t<" << (cm->m_Error ? "Error" : "Warning") << ">\n"
-       << "\t\t<BuildLogLine>" << cm->m_LogLine << "</BuildLogLine>\n"
-       << "\t\t<Text>" << this->MakeXMLSafe(cm->m_Text) 
-       << "\n</Text>" << std::endl;
-    if ( cm->m_SourceFile.size() > 0 )
-      {
-      os << "\t\t<SourceFile>" << cm->m_SourceFile << "</SourceFile>" 
-         << std::endl;
-      }
-    if ( cm->m_SourceFileTail.size() > 0 )
-      {
-      os << "\t\t<SourceFileTail>" << cm->m_SourceFileTail 
-         << "</SourceFileTail>" << std::endl;
-      }
-    if ( cm->m_LineNumber >= 0 )
-      {
-      os << "\t\t<SourceLineNumber>" << cm->m_LineNumber 
-         << "</SourceLineNumber>" << std::endl;
-      }
-    os << "\t\t<PreContext>" << this->MakeXMLSafe(cm->m_PreContext) 
-       << "</PreContext>\n"
-       << "\t\t<PostContext>" << this->MakeXMLSafe(cm->m_PostContext) 
-       << "</PostContext>\n"
-       << "\t\t<RepeatCount>0</RepeatCount>\n"
-       << "</" << (cm->m_Error ? "Error" : "Warning") << ">\n\n" 
-       << std::endl;
-    }
-  os << "\t<Log Encoding=\"base64\" Compression=\"/bin/gzip\">\n\t</Log>\n"
-     << "\t<EndDateTime>" << m_EndBuild << "</EndDateTime>\n"
-     << "</Build>\n"
-     << "</Site>" << std::endl;
-}
-  
-void ctest::ProcessDirectory(std::vector<std::string> &passed, 
-                             std::vector<std::string> &failed)
-{
-  // does the DartTestfile.txt exist ?
-  if(!cmSystemTools::FileExists("DartTestfile.txt"))
-    {
-    return;
-    }
-  
-  // parse the file
-  std::ifstream fin("DartTestfile.txt");
-  if(!fin)
-    {
-    return;
-    }
-
-  int firstTest = 1;
-  long line = 0;
-  
-  cmRegularExpression ireg(this->m_IncludeRegExp.c_str());
-  cmRegularExpression ereg(this->m_ExcludeRegExp.c_str());
-  cmRegularExpression dartStuff("([\t\n ]*<DartMeasurement.*/DartMeasurement[a-zA-Z]*>[\t ]*[\n]*)");
-
-  bool parseError;
-  while ( fin )
-    {
-    cmListFileFunction lff;
-    if(cmListFileCache::ParseFunction(fin, lff, "DartTestfile.txt",
-                                      parseError, line))
-      {
-      const std::string& name = lff.m_Name;
-      const std::vector<cmListFileArgument>& args = lff.m_Arguments;
-      if (name == "SUBDIRS")
-        {
-        std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
-        for(std::vector<cmListFileArgument>::const_iterator j = args.begin();
-            j != args.end(); ++j)
-          {   
-          std::string nwd = cwd + "/";
-          nwd += j->Value;
-          if (cmSystemTools::FileIsDirectory(nwd.c_str()))
-            {
-            cmSystemTools::ChangeDirectory(nwd.c_str());
-            this->ProcessDirectory(passed, failed);
-            }
-          }
-        // return to the original directory
-        cmSystemTools::ChangeDirectory(cwd.c_str());
-        }
-      
-      if (name == "ADD_TEST")
-        {
-        if (this->m_UseExcludeRegExp && 
-            this->m_UseExcludeRegExpFirst && 
-            ereg.find(args[0].Value.c_str()))
-          {
-          continue;
-          }
-        if (this->m_UseIncludeRegExp && !ireg.find(args[0].Value.c_str()))
-          {
-          continue;
-          }
-        if (this->m_UseExcludeRegExp && 
-            !this->m_UseExcludeRegExpFirst && 
-            ereg.find(args[0].Value.c_str()))
-          {
-          continue;
-          }
-
-        cmCTestTestResult cres;
-
-        if (firstTest)
-          {
-          std::string nwd = cmSystemTools::GetCurrentWorkingDirectory();
-          std::cerr << "Changing directory into " << nwd.c_str() << "\n";
-          firstTest = 0;
-          }
-        cres.m_Name = args[0].Value;
-        if ( m_ShowOnly )
-          {
-          std::cout << args[0].Value << std::endl;
-          }
-        else
-          {
-          fprintf(stderr,"Testing %-30s ",args[0].Value.c_str());
-          fflush(stderr);
-          }
-        //std::cerr << "Testing " << args[0] << " ... ";
-        // find the test executable
-        std::string testCommand = this->FindExecutable(args[1].Value.c_str());
-        testCommand = cmSystemTools::ConvertToOutputPath(testCommand.c_str());
-
-        // continue if we did not find the executable
-        if (testCommand == "")
-          {
-          std::cerr << "Unable to find executable: " << 
-            args[1].Value.c_str() << "\n";
-          continue;
-          }
-        
-        // add the arguments
-        std::vector<cmListFileArgument>::const_iterator j = args.begin();
-        ++j;
-        ++j;
-        for(;j != args.end(); ++j)
-          {   
-          testCommand += " ";
-          testCommand += cmSystemTools::EscapeSpaces(j->Value.c_str());
-          }
-        /**
-         * Run an executable command and put the stdout in output.
-         */
-        std::string output;
-        int retVal = 0;
-
-        double clock_start, clock_finish;
-        clock_start = cmSystemTools::GetTime();
-
-        if ( m_Verbose )
-          {
-          std::cout << std::endl << "Test command: " << testCommand << std::endl;
-          }
-        bool res = true;
-        if ( !m_ShowOnly )
-          {
-          res = cmSystemTools::RunCommand(testCommand.c_str(), output, 
-                                          retVal, 0, false);
-          }
-        clock_finish = cmSystemTools::GetTime();
-
-        cres.m_ExecutionTime = (double)(clock_finish - clock_start);
-        cres.m_FullCommandLine = testCommand;
-
-        if ( !m_ShowOnly )
-          {
-          if (!res || retVal != 0)
-            {
-            fprintf(stderr,"***Failed\n");
-            if (output != "")
-              {
-              if (dartStuff.find(output.c_str()))
-                {
-                cmSystemTools::ReplaceString(output,
-                                             dartStuff.match(1).c_str(),"");
-                }
-              if (output != "" && m_Verbose)
-                {
-                std::cerr << output.c_str() << "\n";
-                }
-              }
-            failed.push_back(args[0].Value); 
-            }
-          else
-            {
-            fprintf(stderr,"   Passed\n");
-            if (output != "")
-              {
-              if (dartStuff.find(output.c_str()))
-                {
-                cmSystemTools::ReplaceString(output,
-                                             dartStuff.match(1).c_str(),"");
-                }
-              if (output != "" && m_Verbose)
-                {
-                std::cerr << output.c_str() << "\n";
-                }
-              }
-            passed.push_back(args[0].Value); 
-            }
-          }
-        cres.m_Output = output;
-        cres.m_ReturnValue = retVal;
-        std::string nwd = cmSystemTools::GetCurrentWorkingDirectory();
-        if ( nwd.size() > m_ToplevelPath.size() )
-          {
-          nwd = "." + nwd.substr(m_ToplevelPath.size(), nwd.npos);
-          }
-        cres.m_Path = nwd;
-        cres.m_CompletionStatus = "Completed";
-        m_TestResults.push_back( cres );
-        }
-      }
-    }
-}
-
-int ctest::TestDirectory()
-{
-  std::vector<std::string> passed;
-  std::vector<std::string> failed;
-  int total;
-
-  m_StartTest = ::CurrentTime();
-  this->ProcessDirectory(passed, failed);
-  m_EndTest = ::CurrentTime();
-
-  total = int(passed.size()) + int(failed.size());
-
-  if (total == 0)
-    {
-    if ( !m_ShowOnly )
-      {
-      std::cerr << "No tests were found!!!\n";
-      }
-    }
-  else
-    {
-    if (passed.size() && (m_UseIncludeRegExp || m_UseExcludeRegExp)) 
-      {
-      std::cerr << "\nThe following tests passed:\n";
-      for(std::vector<std::string>::iterator j = passed.begin();
-          j != passed.end(); ++j)
-        {   
-        std::cerr << "\t" << *j << "\n";
-        }
-      }
-
-    float percent = float(passed.size()) * 100.0f / total;
-    fprintf(stderr,"\n%.0f%% tests passed, %i tests failed out of %i\n",
-            percent, int(failed.size()), total);
-
-    if (failed.size()) 
-      {
-      std::cerr << "\nThe following tests FAILED:\n";
-      for(std::vector<std::string>::iterator j = failed.begin();
-          j != failed.end(); ++j)
-        {   
-        std::cerr << "\t" << *j << "\n";
-        }
-      }
-    }
-
-  if ( m_DartMode )
-    {
-    std::ofstream ofs;
-    if( !this->OpenOutputFile("", "Test.xml", ofs) )
-      {
-      std::cerr << "Cannot create testing XML file" << std::endl;
-      return 1;
-      }
-    this->GenerateDartOutput(ofs);
-    }
-
-  return int(failed.size());
-}
-
-void ctest::GenerateDartOutput(std::ostream& os)
-{
-  if ( !m_DartMode )
-    {
-    return;
-    }
-
-  if ( m_TestResults.size() == 0 )
-    {
-    return;
-    }
-
-  os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-     << "<Site BuildName=\"" << m_DartConfiguration["BuildName"]
-     << "\" BuildStamp=\"" << m_CurrentTag << "-Experimental\" Name=\""
-     << m_DartConfiguration["Site"] << "\">\n"
-     << "<Testing>\n"
-     << "\t<StartDateTime>" << m_StartTest << "</StartDateTime>\n"
-     << "\t<TestList>\n";
-  tm_TestResultsVector::size_type cc;
-  for ( cc = 0; cc < m_TestResults.size(); cc ++ )
-    {
-    cmCTestTestResult *result = &m_TestResults[cc];
-    os << "\t\t<Test>" << this->MakeXMLSafe(result->m_Path) 
-       << "/" << this->MakeXMLSafe(result->m_Name)
-       << "</Test>" << std::endl;
-    }
-  os << "\t</TestList>\n";
-  for ( cc = 0; cc < m_TestResults.size(); cc ++ )
-    {
-    cmCTestTestResult *result = &m_TestResults[cc];
-    os << "\t<Test Status=\"" << (result->m_ReturnValue?"failed":"passed") 
-       << "\">\n"
-       << "\t\t<Name>" << this->MakeXMLSafe(result->m_Name) << "</Name>\n"
-       << "\t\t<Path>" << this->MakeXMLSafe(result->m_Path) << "</Path>\n"
-       << "\t\t<FullName>" << this->MakeXMLSafe(result->m_Path) 
-       << "/" << this->MakeXMLSafe(result->m_Name) << "</FullName>\n"
-       << "\t\t<FullCommandLine>" 
-       << this->MakeXMLSafe(result->m_FullCommandLine) 
-       << "</FullCommandLine>\n"
-       << "\t\t<Results>" << std::endl;
-    if ( result->m_ReturnValue )
-      {
-      os << "\t\t\t<NamedMeasurement type=\"text/string\" name=\"Exit Code\"><Value>"
-         << "CHILDSTATUS" << "</Value></NamedMeasurement>\n"
-         << "\t\t\t<NamedMeasurement type=\"text/string\" name=\"Exit Value\"><Value>"
-         << result->m_ReturnValue << "</Value></NamedMeasurement>" << std::endl;
-      }
-    os << "\t\t\t<NamedMeasurement type=\"numeric/double\" "
-       << "name=\"Execution Time\"><Value>"
-       << result->m_ExecutionTime << "</Value></NamedMeasurement>\n"
-       << "\t\t\t<NamedMeasurement type=\"text/string\" "
-       << "name=\"Completion Status\"><Value>"
-       << result->m_CompletionStatus << "</Value></NamedMeasurement>\n"
-       << "\t\t\t<Measurement>\n"
-       << "\t\t\t\t<Value>" << this->MakeXMLSafe(result->m_Output) 
-       << "</Value>\n"
-       << "\t\t\t</Measurement>\n"
-       << "\t\t</Results>\n"
-       << "\t</Test>" << std::endl;
-    }
-  
-  os << "\t<EndDateTime>" << m_EndTest << "</EndDateTime>\n"
-     << "</Testing>\n"
-     << "</Site>" << std::endl;
-}
-
-int ctest::ProcessTests()
-{
-  int res = 0;
-  bool notest = true;
-  int cc;
-
-  for ( cc = 0; cc < LAST_TEST; cc ++ )
-    {
-    if ( m_Tests[cc] )
-      {
-      notest = false;
-      break;
-      }
-    }
-  if ( m_Tests[UPDATE_TEST] || m_Tests[ALL_TEST] )
-    {
-    res += this->UpdateDirectory();
-    }
-  if ( m_Tests[CONFIGURE_TEST] || m_Tests[ALL_TEST] )
-    {
-    res += this->ConfigureDirectory();
-    }
-  if ( m_Tests[BUILD_TEST] || m_Tests[ALL_TEST] )
-    {
-    res += this->BuildDirectory();
-    }
-  if ( m_Tests[TEST_TEST] || m_Tests[ALL_TEST] || notest )
-    {
-    res += this->TestDirectory();
-    }
-  if ( m_Tests[COVERAGE_TEST] || m_Tests[ALL_TEST] )
-    {
-    this->CoverageDirectory();
-    }
-  if ( m_Tests[PURIFY_TEST] || m_Tests[ALL_TEST] )
-    {
-    std::cerr << "Purify test is not yet implemented" << std::endl;
-    }
-  return res;
-}
-
-
-// this is a test driver program for cmake.
+// this is a test driver program for cmCTest.
 int main (int argc, char *argv[])
 {
   cmSystemTools::EnableMSVCDebugHook();
-  ctest inst;
+  cmCTest inst;
   
   // look at the args
   std::vector<std::string> args;