summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestTestHandler.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-05-04 20:55:13 (GMT)
committerBrad King <brad.king@kitware.com>2023-05-04 21:11:19 (GMT)
commit0a5aeaf302369ab62f89ab35b0f0fb690f71c05a (patch)
treeee96d9c010f9b2c44d10bd13c1e3091a63735362 /Source/CTest/cmCTestTestHandler.h
parent426e38cc104673e8056caa243950c330a87e20af (diff)
downloadCMake-0a5aeaf302369ab62f89ab35b0f0fb690f71c05a.zip
CMake-0a5aeaf302369ab62f89ab35b0f0fb690f71c05a.tar.gz
CMake-0a5aeaf302369ab62f89ab35b0f0fb690f71c05a.tar.bz2
cmCTestRunTest: Consolidate test timeout selection logic
Test timeout selection was previously spread out over several locations. Consolidate it in a single place to make it easier to follow.
Diffstat (limited to 'Source/CTest/cmCTestTestHandler.h')
-rw-r--r--Source/CTest/cmCTestTestHandler.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index 29d24e0..b7c0faf 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -14,6 +14,8 @@
#include <utility>
#include <vector>
+#include <cm/optional>
+
#include "cmsys/RegularExpression.hxx"
#include "cmCTest.h"
@@ -145,8 +147,7 @@ public:
float Cost = 0;
int PreviousRuns = 0;
bool RunSerial = false;
- cmDuration Timeout = cmDuration::zero();
- bool ExplicitTimeout = false;
+ cm::optional<cmDuration> Timeout;
cmDuration AlternateTimeout;
int Index = 0;
// Requested number of process slots