Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
d1c4a0bf
Commit
d1c4a0bf
authored
Jun 08, 2007
by
Ken Martin
Browse files
BUG: fix timeout bug with global timeouts such as DART_TESTING_TIMEOUT
parent
546d7e72
Changes
1
Hide whitespace changes
Inline
Side-by-side
Source/cmCTest.cxx
View file @
d1c4a0bf
...
...
@@ -1098,7 +1098,8 @@ int cmCTest::RunTest(std::vector<const char*> argv,
{
timeout
=
1
;
}
cmCTestLog
(
this
,
HANDLER_VERBOSE_OUTPUT
,
"Test timeout computed to be: "
<<
timeout
<<
"
\n
"
);
if
(
cmSystemTools
::
SameFile
(
argv
[
0
],
this
->
CTestSelf
.
c_str
())
&&
!
this
->
ForceNewCTestProcess
)
{
...
...
@@ -1113,7 +1114,7 @@ int cmCTest::RunTest(std::vector<const char*> argv,
// 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
&&
t
estT
ime
O
ut
)
if
(
strcmp
(
argv
[
i
],
"--build-generator"
)
==
0
&&
time
o
ut
)
{
args
.
push_back
(
"--test-timeout"
);
cmOStringStream
msg
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment