1 files changed, 18 insertions, 10 deletions
diff --git a/Source/CTest/cmCTestTestCommand.h b/Source/CTest/cmCTestTestCommand.h
index c0e6bf3..d68de9f 100644
--- a/Source/CTest/cmCTestTestCommand.h
+++ b/Source/CTest/cmCTestTestCommand.h
@@ -17,18 +17,20 @@
 #ifndef cmCTestTestCommand_h
 #define cmCTestTestCommand_h
 
-#include "cmCTestCommand.h"
+#include "cmCTestHandlerCommand.h"
+
+class cmCTestGenericHandler;
 
 /** \class cmCTestTest
  * \brief Run a ctest script
  *
  * cmCTestTestCommand defineds the command to test the project.
  */
-class cmCTestTestCommand : public cmCTestCommand
+class cmCTestTestCommand : public cmCTestHandlerCommand
 {
 public:
 
-  cmCTestTestCommand() {}
+  cmCTestTestCommand();
   
   /**
    * This is a virtual constructor for the command.
@@ -42,12 +44,6 @@ public:
     }
 
   /**
-   * This is called when the command is first encountered in
-   * the CMakeLists.txt file.
-   */
-  virtual bool InitialPass(std::vector<std::string> const& args);
-
-  /**
    * The name of the command as specified in CMakeList.txt.
    */
   virtual const char* GetName() { return "CTEST_TEST";}
@@ -71,8 +67,20 @@ public:
       "second argument is a variable that will hold value.";
     }
 
-  cmTypeMacro(cmCTestTestCommand, cmCTestCommand);
+  cmTypeMacro(cmCTestTestCommand, cmCTestHandlerCommand);
+
+protected:
+  cmCTestGenericHandler* InitializeActualHandler();
+  cmCTestGenericHandler* InitializeHandler();
 
+  enum {
+    ctt_BUILD = ct_LAST,
+    ctt_RETURN_VALUE,
+    ctt_START,
+    ctt_END,
+    ctt_STRIDE,
+    ctt_LAST
+  };
 };