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

ENH: fix passing of time limit to some ctest invocations that also use build-options

Browse Source
This commit is contained in:
Ken Martin 2007-06-04 13:39:43 -04:00
parent 3bcec6e36c
commit 8fdca686b3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CTest/cmCTestBuildAndTestHandler.cxx
View File

@ -457,8 +457,8 @@ int cmCTestBuildAndTestHandler::ProcessCommandLineArguments(
{ {
this->BuildOptions.push_back(allArgs[idx]); this->BuildOptions.push_back(allArgs[idx]);
if(idx+1 < allArgs.size() if(idx+1 < allArgs.size()
&& (allArgs[idx+1] == "--build-target" || && (allArgs[idx+1] == "--build-target" ||
allArgs[idx+1] == "--test-command")) allArgs[idx+1] == "--test-command"))
{ {
done = true; done = true;
} }

6
Source/cmCTest.cxx
View File

@ -1094,8 +1094,10 @@ int cmCTest::RunTest(std::vector<const char*> argv,
{ {
if(argv[i]) if(argv[i])
{ {
// if this test has a test command make sure we pass the timeout in // make sure we pass the timeout in for any build and test
if (strcmp(argv[i],"--test-command") == 0 && testTimeOut) // invocations. Since --build-generator is required this is a
// good place to check for it, and to add the arguments in
if (strcmp(argv[i],"--build-generator") == 0 && testTimeOut)
{ {
args.push_back("--test-timeout"); args.push_back("--test-timeout");
cmOStringStream msg; cmOStringStream msg;