summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/CTest/cmCTestRunTest.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 94ccffe..72f3d40 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -564,7 +564,8 @@ double cmCTestRunTest::ResolveTimeout()
"Exiting ctest." << std::endl);
exit(-1);
}
- return timeout == 0 ? stop_timeout : min(timeout, stop_timeout);
+ return timeout == 0 ? stop_timeout :
+ (timeout < stop_timeout ? timeout : stop_timeout);
}
//----------------------------------------------------------------------