diff options
| author | Ken Martin <ken.martin@kitware.com> | 2007-06-04 17:39:43 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2007-06-04 17:39:43 (GMT) |
| commit | 8fdca686b3d4659328dafd5501dd25daef4e711a (patch) | |
| tree | a314d28d51f68af25c8546d736f40fa96bd00002 /Source/cmCTest.cxx | |
| parent | 3bcec6e36c9826fba12f188898f9d61c882b3424 (diff) | |
| download | CMake-8fdca686b3d4659328dafd5501dd25daef4e711a.zip CMake-8fdca686b3d4659328dafd5501dd25daef4e711a.tar.gz CMake-8fdca686b3d4659328dafd5501dd25daef4e711a.tar.bz2 | |
ENH: fix passing of time limit to some ctest invocations that also use build-options
Diffstat (limited to 'Source/cmCTest.cxx')
| -rw-r--r-- | Source/cmCTest.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 57eee39..db6c38c 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -1094,8 +1094,10 @@ int cmCTest::RunTest(std::vector<const char*> argv, { if(argv[i]) { - // if this test has a test command make sure we pass the timeout in - if (strcmp(argv[i],"--test-command") == 0 && testTimeOut) + // make sure we pass the timeout in for any build and test + // 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"); cmOStringStream msg; |