|
|
@@ -1,11 +1,5 @@
|
|
|
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
|
|
file Copyright.txt or https://cmake.org/licensing for details. */
|
|
|
-#ifdef _WIN32
|
|
|
-/* windows.h defines min() and max() macros by default. This interferes with
|
|
|
- * C++ functions names.
|
|
|
- */
|
|
|
-#define NOMINMAX
|
|
|
-#endif
|
|
|
#include "cmCTest.h"
|
|
|
|
|
|
#include "cm_curl.h"
|
|
|
@@ -1089,7 +1083,7 @@ int cmCTest::RunTest(std::vector<const char*> argv, std::string* output,
|
|
|
|
|
|
// determine how much time we have
|
|
|
std::chrono::duration<double> timeout = this->GetRemainingTimeAllowed();
|
|
|
- if (timeout != std::chrono::duration<double>::max()) {
|
|
|
+ if (timeout != cmCTest::MaxDuration()) {
|
|
|
timeout -= std::chrono::minutes(2);
|
|
|
}
|
|
|
if (this->TimeOut > std::chrono::duration<double>::zero() &&
|
|
|
@@ -1107,7 +1101,7 @@ int cmCTest::RunTest(std::vector<const char*> argv, std::string* output,
|
|
|
}
|
|
|
cmCTestLog(
|
|
|
this, HANDLER_VERBOSE_OUTPUT, "Test timeout computed to be: "
|
|
|
- << (timeout == std::chrono::duration<double>::max()
|
|
|
+ << (timeout == cmCTest::MaxDuration()
|
|
|
? std::string("infinite")
|
|
|
: std::to_string(
|
|
|
std::chrono::duration_cast<std::chrono::seconds>(timeout)
|
|
|
@@ -1130,7 +1124,7 @@ int cmCTest::RunTest(std::vector<const char*> argv, std::string* output,
|
|
|
// invocations. Since --build-generator is required this is a
|
|
|
// good place to check for it, and to add the arguments in
|
|
|
if (strcmp(i, "--build-generator") == 0 &&
|
|
|
- timeout != std::chrono::duration<double>::max() &&
|
|
|
+ timeout != cmCTest::MaxDuration() &&
|
|
|
timeout > std::chrono::duration<double>::zero()) {
|
|
|
args.push_back("--test-timeout");
|
|
|
std::ostringstream msg;
|
|
|
@@ -2805,7 +2799,7 @@ void cmCTest::Log(int logType, const char* file, int line, const char* msg,
|
|
|
std::chrono::duration<double> cmCTest::GetRemainingTimeAllowed()
|
|
|
{
|
|
|
if (!this->GetHandler("script")) {
|
|
|
- return std::chrono::duration<double>::max();
|
|
|
+ return cmCTest::MaxDuration();
|
|
|
}
|
|
|
|
|
|
cmCTestScriptHandler* ch =
|
|
|
@@ -2814,6 +2808,11 @@ std::chrono::duration<double> cmCTest::GetRemainingTimeAllowed()
|
|
|
return ch->GetRemainingTimeAllowed();
|
|
|
}
|
|
|
|
|
|
+std::chrono::duration<double> cmCTest::MaxDuration()
|
|
|
+{
|
|
|
+ return std::chrono::duration<double>(1.0e7);
|
|
|
+}
|
|
|
+
|
|
|
void cmCTest::OutputTestErrors(std::vector<char> const& process_output)
|
|
|
{
|
|
|
std::string test_outputs("\n*** Test Failed:\n");
|