diff options
Diffstat (limited to 'Source/cmCTest.h')
| -rw-r--r-- | Source/cmCTest.h | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 5a154fc..845a6a7 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; |