ENH: Several cleanups and make sure things get propagated where they should. Also, allow to load CTest custom files to the actual ctest -S script

1 files changed, 5 insertions, 9 deletions

diff --git a/Source/CTest/cmCTestSubmitCommand.h b/Source/CTest/cmCTestSubmitCommand.h
index a683781fff..819a1400b0 100644
--- a/Source/CTest/cmCTestSubmitCommand.h
+++ b/Source/CTest/cmCTestSubmitCommand.h
@@ -17,7 +17,7 @@
 #ifndef cmCTestSubmitCommand_h
 #define cmCTestSubmitCommand_h
 
-#include "cmCTestCommand.h"
+#include "cmCTestHandlerCommand.h"
 
 /** \class cmCTestSubmit
  * \brief Run a ctest script
@@ -25,7 +25,7 @@
  * cmCTestSubmitCommand defineds the command to submit the test results for
  * the project.
  */
-class cmCTestSubmitCommand : public cmCTestCommand
+class cmCTestSubmitCommand : public cmCTestHandlerCommand
 {
 public:
 
@@ -43,12 +43,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_SUBMIT";}
@@ -71,8 +65,10 @@ public:
       "Submits the test results for the project.";
     }
 
-  cmTypeMacro(cmCTestSubmitCommand, cmCTestCommand);
+  cmTypeMacro(cmCTestSubmitCommand, cmCTestHandlerCommand);
 
+protected:
+  cmCTestGenericHandler* InitializeHandler();
 };