starting cleanup of ctest

3 files changed, 34 insertions, 513 deletions

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index fe8acc6b2c..d107717ad7 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -109,7 +109,8 @@ ENDIF(CMAKE_BUILD_MFC_DIALOG)
 ADD_EXECUTABLE(cmake cmakemain.cxx)
 ADD_EXECUTABLE(DumpDocumentation cmDumpDocumentation)
 
-SET(CMTEST_SRCS ctest.cxx cmCTest.cxx)
+SET(CMTEST_SRCS ctest.cxx cmCTest.cxx ctest/cmCTestScriptHandler.cxx)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Source/CTest)
 
 IF (UNIX)
   TARGET_LINK_LIBRARIES(CMakeLib ${CMAKE_DL_LIBS})
@@ -127,7 +128,6 @@ IF(CMAKE_BUILD_WITH_CURL)
   ADD_DEFINITIONS(-DHAVE_CURL)
   INCLUDE_DIRECTORIES(
     ${CMAKE_SOURCE_DIR}/Source/CTest/Curl
-    ${CMAKE_SOURCE_DIR}/Source/CTest
     )
 ENDIF(CMAKE_BUILD_WITH_CURL)
 
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 8cd817f706..455432bc3b 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -23,6 +23,7 @@
 #include "cmGlob.h"
 #include "cmDynamicLoader.h"
 
+#include "cmcTestScriptHandler.h"
 #include "cmCTestSubmit.h"
 #include "curl/curl.h"
 
@@ -35,24 +36,12 @@
 #include <math.h>
 #include <float.h>
 
-// needed for sleep
-#if !defined(_WIN32)
-# include <unistd.h>
-#endif
-
 #include <memory> // auto_ptr
 
 #define SAFEDIV(x,y) (((y)!=0)?((x)/(y)):(0))
 #define DEBUGOUT std::cout << __LINE__ << " "; std::cout
 #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr
 
-// provide some more detailed info on the return code for ctest
-#define CTEST_UPDATE_ERRORS 0x01
-#define CTEST_CONFIGURE_ERRORS 0x02
-#define CTEST_BUILD_ERRORS 0x04
-#define CTEST_TEST_ERRORS 0x08
-#define CTEST_MEMORY_ERRORS 0x10
-
 static struct tm* GetNightlyTime(std::string str, bool verbose, bool tomorrowtag)
 {
   struct tm* lctime;
@@ -419,6 +408,13 @@ cmCTest::cmCTest()
   m_ShortDateFormat        = true;
   m_MaximumPassedTestResultSize  = 100 * 1024;
   m_MaximumFailedTestResultSize  = 200 * 1024;
+
+  this->ScriptHandler = new cmCTestScriptHandler;
+}
+
+cmCTest::~cmCTest() 
+{ 
+  delete this->ScriptHandler;
 }
 
 int cmCTest::Initialize()
@@ -3081,7 +3077,7 @@ int cmCTest::ProcessTests()
     update_count = this->UpdateDirectory(); 
     if ( update_count < 0 )
       {
-      res |= CTEST_UPDATE_ERRORS;
+      res |= cmCTest::UPDATE_ERRORS;
       }
     }
   if ( m_TestModel == cmCTest::CONTINUOUS && !update_count )
@@ -3092,7 +3088,7 @@ int cmCTest::ProcessTests()
     {
     if (this->ConfigureDirectory())
       {
-      res |= CTEST_CONFIGURE_ERRORS;
+      res |= cmCTest::CONFIGURE_ERRORS;
       }
     }
   if ( m_Tests[BUILD_TEST] || m_Tests[ALL_TEST] )
@@ -3100,7 +3096,7 @@ int cmCTest::ProcessTests()
     this->UpdateCTestConfiguration();
     if (this->BuildDirectory())
       {
-      res |= CTEST_BUILD_ERRORS;
+      res |= cmCTest::BUILD_ERRORS;
       }
     }
   if ( m_Tests[TEST_TEST] || m_Tests[ALL_TEST] || notest )
@@ -3108,7 +3104,7 @@ int cmCTest::ProcessTests()
     this->UpdateCTestConfiguration();
     if (this->TestDirectory(false))
       {
-      res |= CTEST_TEST_ERRORS;
+      res |= cmCTest::TEST_ERRORS;
       }
     }
   if ( m_Tests[COVERAGE_TEST] || m_Tests[ALL_TEST] )
@@ -3121,7 +3117,7 @@ int cmCTest::ProcessTests()
     this->UpdateCTestConfiguration();
     if (this->TestDirectory(true))
       {
-      res |= CTEST_MEMORY_ERRORS;
+      res |= cmCTest::MEMORY_ERRORS;
       }
     }
   if ( !notest )
@@ -3602,480 +3598,6 @@ const char* cmCTest::GetTestStatus(int status)
   return statuses[status];
 }
 
-void cmCTest::RestoreBackupDirectories(bool backup, 
-  const char *srcDir, 
-  const char *binDir,
-  const char *backupSrcDir,
-  const char *backupBinDir)
-{
-  // if we backed up the dirs and the build failed, then restore
-  // the backed up dirs
-  if (backup)
-    {
-    // if for some reason those directories exist then first delete them
-    if (cmSystemTools::FileExists(srcDir))
-      {
-      cmSystemTools::RemoveADirectory(srcDir);
-      }
-    if (cmSystemTools::FileExists(binDir))
-      {
-      cmSystemTools::RemoveADirectory(binDir);
-      }
-    // rename the src and binary directories 
-    rename(backupSrcDir, srcDir);
-    rename(backupBinDir, binDir);
-    }
-}
-
-int cmCTest::RunConfigurationScript()
-{
-  int res = 0;
-  cmCTest::tm_VectorOfStrings::iterator it;
-  for ( it = m_ConfigurationScripts.begin();
-    it != m_ConfigurationScripts.end();
-    it ++ )
-    {
-    res += this->RunConfigurationScript(
-      cmSystemTools::CollapseFullPath(it->c_str()));
-    }
-  return res;
-}
-
-int cmCTest::RunConfigurationScript(const std::string& total_script_arg)
-{
-  // if the argument has a , in it then it needs to be broken into the fist
-  // argument (which is the script) and the second argument which will be passed 
-  // into the scripts as S_ARG
-  std::string script = total_script_arg;
-  std::string script_arg;
-  if (total_script_arg.find(",") != std::string::npos)
-    {
-    script = total_script_arg.substr(0,total_script_arg.find(","));
-    script_arg = total_script_arg.substr(total_script_arg.find(",")+1);
-    }
-  
-  // make sure the file exists
-  if (!cmSystemTools::FileExists(script.c_str()))
-    {
-    std::cerr << "Cannot find file: " << script.c_str() << std::endl;
-    return 1;
-    }
-
-  // create a cmake instance to read the configuration script
-  cmake cm;
-  cmGlobalGenerator gg;
-  gg.SetCMakeInstance(&cm);
-
-  // read in the list file to fill the cache
-  std::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator());
-  lg->SetGlobalGenerator(&gg);
-
-  // set a variable with the path to the current script
-  lg->GetMakefile()->AddDefinition("CTEST_SCRIPT_DIRECTORY",
-    cmSystemTools::GetFilenamePath(
-      script).c_str());
-  lg->GetMakefile()->AddDefinition("CTEST_SCRIPT_NAME",
-    cmSystemTools::GetFilenameName(
-      script).c_str());
-  // add the script arg if defined
-  if (script_arg.size())
-    {
-    lg->GetMakefile()->AddDefinition("CTEST_SCRIPT_ARG",
-                                     script_arg.c_str());
-    }
-  if (!lg->GetMakefile()->ReadListFile(0, script.c_str()))
-    {
-    return 2;
-    }
-
-  // no popup widows
-  cmSystemTools::SetRunCommandHideConsole(true);
-
-  // get some info that should be set
-  cmMakefile *mf = lg->GetMakefile();
-  const char *srcDir = mf->GetDefinition("CTEST_SOURCE_DIRECTORY");
-  const char *binDir = mf->GetDefinition("CTEST_BINARY_DIRECTORY");
-  const char *ctestCmd = mf->GetDefinition("CTEST_COMMAND");
-  bool backup = mf->IsOn("CTEST_BACKUP_AND_RESTORE");
-
-  // in order to back we also must have the cvs root
-  const char *cvsCheckOut = mf->GetDefinition("CTEST_CVS_CHECKOUT");
-  if (backup && !cvsCheckOut)
-    {
-    cmSystemTools::Error("Backup was requested without specifying CTEST_CVS_CHECKOUT.");    
-    return 3;
-    }
-
-  // make sure the required info is here
-  if (!srcDir || !binDir || !ctestCmd)
-    {
-    std::string message = "CTEST_SOURCE_DIRECTORY = ";
-    message += (srcDir) ? srcDir: "(Null)";
-    message += "\nCTEST_BINARY_DIRECTORY = ";
-    message += (srcDir) ? binDir: "(Null)";
-    message += "\nCTEST_CMAKE_COMMAND = ";
-    message += (ctestCmd) ? ctestCmd: "(Null)";
-    cmSystemTools::Error("Some required settings in the configuration file were missing:\n",
-                         message.c_str());
-    return 4;
-    }
-
-  // set any environment variables
-  const char *ctestEnv = mf->GetDefinition("CTEST_ENVIRONMENT");
-  if (ctestEnv)
-    {
-    std::vector<std::string> envArgs;
-    cmSystemTools::ExpandListArgument(ctestEnv,envArgs);
-    // for each variable/argument do a putenv
-    for (unsigned i = 0; i < envArgs.size(); ++i)
-      {
-      cmSystemTools::PutEnv(envArgs[i].c_str());
-      }
-    }
-
-  // if the dashboard root isn't specified then we can compute it from the
-  // srcDir
-  char *ctestRoot;
-  if (mf->GetDefinition("CTEST_DASHBOARD_ROOT"))
-    {
-    ctestRoot = new char [strlen(mf->GetDefinition("CTEST_DASHBOARD_ROOT"))+1];
-    strcpy(ctestRoot,mf->GetDefinition("CTEST_DASHBOARD_ROOT"));
-    }
-  else
-    {
-    ctestRoot = new char [cmSystemTools::GetFilenamePath(srcDir).size()+1];
-    strcpy(ctestRoot,cmSystemTools::GetFilenamePath(srcDir).c_str());
-    }
-
-  // now that we have done most of the error checking finally run the
-  // dashboard, we may be asked to repeatedly run this dashboard, such as
-  // for a continuous
-  int returnValue = 0;
-  if (mf->GetDefinition("CTEST_CONTINUOUS_DURATION"))
-    {
-    // the *60 is becuase the settings are in minutes but GetTime is seconds
-    double minimumInterval = 30*60;
-    if (mf->GetDefinition("CTEST_CONTINUOUS_MINIMUM_INTERVAL"))
-      {
-      minimumInterval = 
-        60*atof(mf->GetDefinition("CTEST_CONTINUOUS_MINIMUM_INTERVAL"));
-      }
-    double duration = 60.0*atof(mf->GetDefinition("CTEST_CONTINUOUS_DURATION"));
-    double clock_start = cmSystemTools::GetTime();
-    if (mf->IsOn("CTEST_START_WITH_EMPTY_BINARY_DIRECTORY_ONCE"))
-      {
-      mf->AddDefinition("CTEST_START_WITH_EMPTY_BINARY_DIRECTORY","1");
-      }
-    while (cmSystemTools::GetTime() < clock_start + duration)
-      {
-      double clock_recent_start = cmSystemTools::GetTime();
-      returnValue = 
-        this->RunConfigurationDashboard(mf, srcDir, binDir, ctestRoot, 
-                                        backup, cvsCheckOut, ctestCmd);
-      double interval = cmSystemTools::GetTime() - clock_recent_start;
-      if (interval < minimumInterval)
-        {
-        unsigned int secondsToWait = 
-          static_cast<unsigned int>(minimumInterval - interval);
-#if defined(_WIN32)
-        Sleep(1000*secondsToWait);
-#else
-        sleep(secondsToWait);
-#endif
-        }
-      if (mf->IsOn("CTEST_START_WITH_EMPTY_BINARY_DIRECTORY_ONCE"))
-        {
-        mf->AddDefinition("CTEST_START_WITH_EMPTY_BINARY_DIRECTORY","0");
-        }
-      }
-    }
-  // otherwise just run it once
-  else
-    {
-    returnValue = 
-      this->RunConfigurationDashboard(mf, srcDir, binDir, ctestRoot,
-                                      backup, cvsCheckOut, ctestCmd);
-    }
-
-  delete [] ctestRoot;
-  return returnValue;
-}
-
-// this function (and the one above it) is too long and will soon be
-// refactored into a seperate class for processing the -S functionality.
-int cmCTest::RunConfigurationDashboard(cmMakefile *mf, 
-                                       const char *srcDir, const char *binDir,
-                                       const char *ctestRoot,
-                                       bool backup, const char *cvsCheckOut,
-                                       const char *ctestCmd)
-{
-  const char *cvsCmd = mf->GetDefinition("CTEST_CVS_COMMAND");
-  
-  // local variables
-  std::string command;
-  std::string output;
-  int retVal = 0;
-  bool res; 
-
-  // make sure the src directory is there, if it isn't then we might be able
-  // to check it out from cvs
-  if (!cmSystemTools::FileExists(srcDir) && cvsCheckOut)
-    {
-    // we must now checkout the src dir
-    output = "";
-    if ( m_Verbose )
-      {
-      std::cerr << "Run cvs: " << cvsCheckOut << std::endl;
-      }
-    res = cmSystemTools::RunSingleCommand(cvsCheckOut, &output, 
-                                          &retVal, ctestRoot,
-                                          m_Verbose, 0 /*m_TimeOut*/);
-    if (!res || retVal != 0)
-      {
-      cmSystemTools::Error("Unable to perform cvs checkout:\n", output.c_str());    
-      return 6;
-      }
-    }
-  
-  // compute the backup names
-  std::string backupSrcDir = srcDir;
-  backupSrcDir += "_CMakeBackup";
-  std::string backupBinDir = binDir;
-  backupBinDir += "_CMakeBackup";
-
-  // backup the binary and src directories if requested
-  if (backup)
-    {
-    // if for some reason those directories exist then first delete them
-    if (cmSystemTools::FileExists(backupSrcDir.c_str()))
-      {
-      cmSystemTools::RemoveADirectory(backupSrcDir.c_str());
-      }
-    if (cmSystemTools::FileExists(backupBinDir.c_str()))
-      {
-      cmSystemTools::RemoveADirectory(backupBinDir.c_str());
-      }
-
-    // first rename the src and binary directories 
-    rename(srcDir, backupSrcDir.c_str());
-    rename(binDir, backupBinDir.c_str());
-
-    // we must now checkout the src dir
-    output = "";
-    if ( m_Verbose )
-      {
-      std::cerr << "Run cvs: " << cvsCheckOut << std::endl;
-      }
-    res = cmSystemTools::RunSingleCommand(cvsCheckOut, &output, 
-                                          &retVal, ctestRoot,
-                                          m_Verbose, 0 /*m_TimeOut*/);
-    if (!res || retVal != 0)
-      {
-      cmSystemTools::Error("Unable to perform cvs checkout:", output.c_str());    
-      this->RestoreBackupDirectories(backup, srcDir, binDir,
-        backupSrcDir.c_str(), 
-        backupBinDir.c_str());
-      return 6;
-      }
-    }
-
-  // clear the binary directory?
-  if (mf->IsOn("CTEST_START_WITH_EMPTY_BINARY_DIRECTORY"))
-    {
-    // try to avoid deleting directories that we shouldn't
-    std::string check = binDir;
-    check += "/CMakeCache.txt";
-    if (cmSystemTools::FileExists(check.c_str()))
-      {
-      cmSystemTools::RemoveADirectory(binDir);
-      }
-    }
-
-  // make sure the binary directory exists if it isn;t the srcdir
-  if (!cmSystemTools::FileExists(binDir) && strcmp(srcDir, binDir))
-    {
-    if (!cmSystemTools::MakeDirectory(binDir))
-      {
-      cmSystemTools::Error("Unable to create the binary directory:\n", binDir);    
-      this->RestoreBackupDirectories(backup, srcDir, binDir,
-        backupSrcDir.c_str(), 
-        backupBinDir.c_str());
-      return 7;
-      }
-    }
-
-  // if the binary directory and the source directory are the same,
-  // and we are starting with an empty binary directory, then that means
-  // we must check out the source tree
-  if (mf->IsOn("CTEST_START_WITH_EMPTY_BINARY_DIRECTORY") &&
-      !strcmp(srcDir, binDir))
-    {
-    // make sure we have the required info
-    if (!cvsCheckOut)
-      {
-      cmSystemTools::Error("You have specified the source and binary directories to be the same (an in source build). You have also specified that the binary directory is to be erased. This means that the source will have to be checked out from CVS. But you have not specified CTEST_CVS_CHECKOUT");    
-      return 8;
-      }
-    
-    // we must now checkout the src dir
-    output = "";
-    if ( m_Verbose )
-      {
-      std::cerr << "Run cvs: " << cvsCheckOut << std::endl;
-      }
-    res = cmSystemTools::RunSingleCommand(cvsCheckOut, &output, 
-                                          &retVal, ctestRoot,
-                                          m_Verbose, 0 /*m_TimeOut*/);
-    if (!res || retVal != 0)
-      {
-      cmSystemTools::Error("Unable to perform cvs checkout:\n", output.c_str());    
-      this->RestoreBackupDirectories(backup, srcDir, binDir,
-                                     backupSrcDir.c_str(), 
-                                     backupBinDir.c_str());
-      return 6;
-      }
-    }
-  
-  // do an initial cvs update as required
-  if (cvsCmd)
-    {
-    command = cvsCmd;
-    char updateVar[40];
-    int i;
-    for (i = 1; i < 10; ++i)
-      {
-      sprintf(updateVar,"CTEST_EXTRA_UPDATES_%i",i);
-      const char *updateVal = mf->GetDefinition(updateVar);
-      if (updateVal)
-        {
-        std::vector<std::string> cvsArgs;
-        cmSystemTools::ExpandListArgument(updateVal,cvsArgs);
-        if (cvsArgs.size() == 2)
-          {
-          std::string fullCommand = command;
-          fullCommand += " update ";
-          fullCommand += cvsArgs[1];
-          output = "";
-          retVal = 0;
-          if ( m_Verbose )
-            {
-            std::cerr << "Run CVS: " << fullCommand.c_str() << std::endl;
-            }
-          res = cmSystemTools::RunSingleCommand(fullCommand.c_str(), &output, 
-            &retVal, cvsArgs[0].c_str(),
-            m_Verbose, 0 /*m_TimeOut*/);
-          if (!res || retVal != 0)
-            {
-            cmSystemTools::Error("Unable to perform extra cvs updates:\n", output.c_str());
-            this->RestoreBackupDirectories(backup, srcDir, binDir,
-              backupSrcDir.c_str(), 
-              backupBinDir.c_str());
-            return 8;
-            }
-          }
-        }
-      }
-    }
-
-  // put the initial cache into the bin dir
-  if (mf->GetDefinition("CTEST_INITIAL_CACHE"))
-    {
-    const char *initCache = mf->GetDefinition("CTEST_INITIAL_CACHE");
-    std::string cacheFile = binDir;
-    cacheFile += "/CMakeCache.txt";
-    std::ofstream fout(cacheFile.c_str());
-    if(!fout)
-      {
-      this->RestoreBackupDirectories(backup, srcDir, binDir,
-        backupSrcDir.c_str(), 
-        backupBinDir.c_str());
-      return 9;
-      }
-
-    fout.write(initCache, strlen(initCache));
-
-    // Make sure the operating system has finished writing the file
-    // before closing it.  This will ensure the file is finished before
-    // the check below.
-    fout.flush();
-    fout.close();
-    }
-
-  // do an initial cmake to setup the DartConfig file
-  const char *cmakeCmd = mf->GetDefinition("CTEST_CMAKE_COMMAND");
-  int cmakeFailed = 0;
-  std::string cmakeFailedOuput;
-  if (cmakeCmd)
-    {
-    command = cmakeCmd;
-    command += " \"";
-    command += srcDir;
-    output = "";
-    command += "\"";
-    retVal = 0;
-    if ( m_Verbose )
-      {
-      std::cerr << "Run cmake command: " << command.c_str() << std::endl;
-      }
-    res = cmSystemTools::RunSingleCommand(command.c_str(), &output, 
-      &retVal, binDir,
-      m_Verbose, 0 /*m_TimeOut*/);
-    if (!res || retVal != 0)
-      {
-      // even if this fails continue to the next step
-      cmakeFailed = 1;
-      cmakeFailedOuput = output;
-      }
-    }
-
-  // run cteste may be more than one command in here
-  std::vector<std::string> ctestCommands;
-  cmSystemTools::ExpandListArgument(ctestCmd,ctestCommands);
-  // for each variable/argument do a putenv
-  for (unsigned i = 0; i < ctestCommands.size(); ++i)
-    {
-    command = ctestCommands[i];
-    output = "";
-    retVal = 0;
-    if ( m_Verbose )
-      {
-      std::cerr << "Run ctest command: " << command.c_str() << std::endl;
-      }
-    res = cmSystemTools::RunSingleCommand(command.c_str(), &output, 
-                                          &retVal, binDir,
-                                          m_Verbose, 0 /*m_TimeOut*/);
-
-    // did something critical fail in ctest
-    if (!res || cmakeFailed ||
-        retVal & CTEST_BUILD_ERRORS)
-      {
-      this->RestoreBackupDirectories(backup, srcDir, binDir,
-                                     backupSrcDir.c_str(), 
-                                     backupBinDir.c_str());
-      if (cmakeFailed)
-        {
-        cmSystemTools::Error("Unable to run cmake:\n", cmakeFailedOuput.c_str());    
-        return 10;
-        }
-      cmSystemTools::Error("Unable to run ctest:\n", output.c_str());    
-      if (!res)
-        {
-        return 11;
-        }
-      return retVal * 100;
-      }
-    }
-  
-  // if all was succesful, delete the backup dirs to free up disk space
-  if (backup)
-    {
-    cmSystemTools::RemoveADirectory(backupSrcDir.c_str());
-    cmSystemTools::RemoveADirectory(backupBinDir.c_str());
-    }
-
-  return 0;  
-}
-
 void cmCTest::StartXML(std::ostream& ostr)
 {
   ostr << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -4362,6 +3884,7 @@ int cmCTest::Run(std::vector<std::string>const& args, std::string* output)
     if( arg.find("-V",0) == 0 || arg.find("--verbose",0) == 0 )
       {
       this->m_Verbose = true;
+      this->ScriptHandler->SetVerbose(this->m_Verbose);
       }
 
     if( arg.find("-N",0) == 0 || arg.find("--show-only",0) == 0 )
@@ -4373,7 +3896,7 @@ int cmCTest::Run(std::vector<std::string>const& args, std::string* output)
       {
       this->m_RunConfigurationScript = true;
       i++;
-      this->m_ConfigurationScripts.push_back(args[i]);
+      this->ScriptHandler->AddConfigurationScript(args[i].c_str());
       }
 
     if( arg.find("--tomorrow-tag",0) == 0 )
@@ -4783,7 +4306,7 @@ int cmCTest::Run(std::vector<std::string>const& args, std::string* output)
     // call process directory
     if (this->m_RunConfigurationScript)
       {
-      res = this->RunConfigurationScript();
+      res = this->ScriptHandler->RunConfigurationScript();
       }
     else
       {
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 5a154fc5f4..845a6a7b81 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -23,6 +23,7 @@
 #include "cmListFileCache.h"
 
 class cmMakefile;
+class cmCTestScriptHandler;
 
 class cmCTest
 {
@@ -34,17 +35,6 @@ public:
   int Run(std::vector<std::string>const&, std::string* output = 0);
   
   /**
-   * Run a dashboard using a specified confiuration script
-   */
-  int RunConfigurationScript();
-  int RunConfigurationScript(const std::string& script);
-  int RunConfigurationDashboard(cmMakefile *mf, 
-                                const char *srcDir, const char *binDir,
-                                const char *ctestRoot,
-                                bool backup, const char *cvsCheckOut,
-                                const char *ctestCmd);
-  
-  /**
    * Initialize and finalize testing
    */
   int Initialize();
@@ -124,10 +114,11 @@ public:
   static int GetTestModelFromString(const char* str);
 
   /**
-   * constructor
+   * constructor and destructor
    */
   cmCTest();
-
+  ~cmCTest();
+  
   //! Set the notes files to be created.
   void SetNotesFiles(const char* notes);
 
@@ -146,7 +137,6 @@ public:
   bool m_ForceNewCTestProcess;
 
   bool m_RunConfigurationScript;
-  tm_VectorOfStrings m_ConfigurationScripts;
 
   enum {
     EXPERIMENTAL,
@@ -154,13 +144,21 @@ public:
     CONTINUOUS
   };
 
-  int GenerateNotesFile(const char* files);
+  // provide some more detailed info on the return code for ctest
+  enum {
+    UPDATE_ERRORS = 0x01,
+    CONFIGURE_ERRORS = 0x02,
+    BUILD_ERRORS = 0x04,
+    TEST_ERRORS = 0x08,
+    MEMORY_ERRORS = 0x10
+  };
 
-  void RestoreBackupDirectories(bool backup, 
-                                const char *srcDir, const char *binDir,
-                                const char *backupSrc, const char *backupBin);
+  int GenerateNotesFile(const char* files);
 
 private:
+  // this is a helper class than handles running test scripts
+  cmCTestScriptHandler *ScriptHandler;
+  
   void SetTestsToRunInformation(const char*);
   void ExpandTestsToRunInformation(int numPossibleTests);
   std::string TestsToRunString;