kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

This commit is contained in:
Zach Mullen 2009-10-26 09:44:08 -04:00
parent 5ff4e04180
commit 99697308f3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CTest/cmCTestBatchTestHandler.cxx
View File

@ -25,7 +25,7 @@ cmCTestBatchTestHandler::~cmCTestBatchTestHandler()
void cmCTestBatchTestHandler::RunTests() void cmCTestBatchTestHandler::RunTests()
{ {
this->WriteBatchScript(); this->WriteBatchScript();
//this->SubmitBatchScript(); this->SubmitBatchScript();
} }
//--------------------------------------------------------- //---------------------------------------------------------
@ -128,16 +128,16 @@ void cmCTestBatchTestHandler::SubmitBatchScript()
args.push_back(this->Script); args.push_back(this->Script);
args.push_back("-o"); args.push_back("-o");
args.push_back(this->CTest->GetBinaryDir() args.push_back(this->CTest->GetBinaryDir()
+ "/Testing/CTestBatchOutput.txt"); + "/Testing/CTestBatch.txt");
sbatch.SetCommand("sbatch"); sbatch.SetCommand("sbatch");
sbatch.SetCommandArguments(args); sbatch.SetCommandArguments(args);
if(sbatch.StartProcess()) /*if(sbatch.StartProcess())
{ {
//success condition //success condition
} }
else else
{ {
//fail condition //fail condition
} }*/
} }

5
Tests/CMakeLists.txt
View File

@ -1186,8 +1186,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
PASS_REGULAR_EXPRESSION "\\*\\*\\*Timeout") PASS_REGULAR_EXPRESSION "\\*\\*\\*Timeout")
ADD_TEST(CTestTestShowOnly ${CMAKE_CTEST_COMMAND} -N) 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. # 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' # After 2.6 is required, this could be a function without the extra 'set'
# calls. # calls.