diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index a3f736596d..2a29949e0b 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -2,7 +2,6 @@ file LICENSE.rst or https://cmake.org/licensing for details. */ #include "cmCTestScriptHandler.h" -#include #include #include #include @@ -118,9 +117,8 @@ int cmCTestScriptHandler::ExecuteScript(std::string const& total_script_arg) std::vector out; std::vector err; std::string line; - auto pipe = - cmSystemTools::WaitForLine(&process.GetLoop(), outPipe, errPipe, line, - std::chrono::seconds(100), out, err); + auto pipe = cmSystemTools::WaitForLine(&process.GetLoop(), outPipe, errPipe, + line, out, err); while (pipe != cmSystemTools::WaitForLineResult::None) { cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Output: " << line << "\n"); @@ -129,9 +127,8 @@ int cmCTestScriptHandler::ExecuteScript(std::string const& total_script_arg) } else if (pipe == cmSystemTools::WaitForLineResult::STDOUT) { cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, line << "\n"); } - pipe = - cmSystemTools::WaitForLine(&process.GetLoop(), outPipe, errPipe, line, - std::chrono::seconds(100), out, err); + pipe = cmSystemTools::WaitForLine(&process.GetLoop(), outPipe, errPipe, + line, out, err); } // Properly handle output of the build command diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 5fd6964201..f00c440c41 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2788,8 +2788,7 @@ bool cmSystemTools::ListTar(std::string const& outFileName, cmSystemTools::WaitForLineResult cmSystemTools::WaitForLine( uv_loop_t* loop, uv_stream_t* outPipe, uv_stream_t* errPipe, - std::string& line, cmDuration timeout, std::vector& out, - std::vector& err) + std::string& line, std::vector& out, std::vector& err) { line.clear(); auto outiter = out.begin(); @@ -2859,22 +2858,7 @@ cmSystemTools::WaitForLineResult cmSystemTools::WaitForLine( ReadData errData; auto errHandle = startRead(errPipe, errData); - cm::uv_timer_ptr timer; - bool timedOut = false; - timer.init(*loop, &timedOut); - timer.start( - [](uv_timer_t* handle) { - auto* timedOutPtr = static_cast(handle->data); - *timedOutPtr = true; - }, - static_cast(timeout.count() * 1000.0), 0, - cm::uv_update_time::no); - uv_run(loop, UV_RUN_ONCE); - if (timedOut) { - // Timeout has been exceeded. - return WaitForLineResult::Timeout; - } if (outData.Read) { processOutput.DecodeText(outData.Buffer.data(), outData.Buffer.size(), strdata, 1); diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 2411c6c35f..5e03ba610b 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -374,13 +374,11 @@ public: None, STDOUT, STDERR, - Timeout, }; /** a general output handler for libuv */ static WaitForLineResult WaitForLine(uv_loop_t* loop, uv_stream_t* outPipe, uv_stream_t* errPipe, std::string& line, - cmDuration timeout, std::vector& out, std::vector& err);