diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2009-10-26 13:44:08 (GMT) |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2009-10-26 13:44:08 (GMT) |
| commit | 99697308f34a1ee012529c591268a000ba8fa456 (patch) | |
| tree | 28c56e784f3065affd97437cec1b3885b9129392 | |
| parent | 5ff4e0418083bcc5e7437321855eb2559347086c (diff) | |
| download | CMake-99697308f34a1ee012529c591268a000ba8fa456.zip CMake-99697308f34a1ee012529c591268a000ba8fa456.tar.gz CMake-99697308f34a1ee012529c591268a000ba8fa456.tar.bz2 | |
Add a ctest test to cover cmCTestBatchTestHandler. Since its behavior isn't fully defined yet, we just run it as is and don't care much about the result.
| -rw-r--r-- | Source/CTest/cmCTestBatchTestHandler.cxx | 8 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx b/Source/CTest/cmCTestBatchTestHandler.cxx index 7c33d70..00bb6fa 100644 --- a/Source/CTest/cmCTestBatchTestHandler.cxx +++ b/Source/CTest/cmCTestBatchTestHandler.cxx @@ -25,7 +25,7 @@ cmCTestBatchTestHandler::~cmCTestBatchTestHandler() void cmCTestBatchTestHandler::RunTests() { this->WriteBatchScript(); - //this->SubmitBatchScript(); + this->SubmitBatchScript(); } //--------------------------------------------------------- @@ -128,16 +128,16 @@ void cmCTestBatchTestHandler::SubmitBatchScript() args.push_back(this->Script); args.push_back("-o"); args.push_back(this->CTest->GetBinaryDir() - + "/Testing/CTestBatchOutput.txt"); + + "/Testing/CTestBatch.txt"); sbatch.SetCommand("sbatch"); sbatch.SetCommandArguments(args); - if(sbatch.StartProcess()) + /*if(sbatch.StartProcess()) { //success condition } else { //fail condition - } + }*/ } diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index ba9139d..645ceaa 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1186,8 +1186,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel PASS_REGULAR_EXPRESSION "\\*\\*\\*Timeout") ADD_TEST(CTestTestShowOnly ${CMAKE_CTEST_COMMAND} -N) - - + + ADD_TEST(CTestBatchTest ${CMAKE_CTEST_COMMAND} -B) + # Use macro, not function so that build can still be driven by CMake 2.4. # After 2.6 is required, this could be a function without the extra 'set' # calls. |