mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmUVProcessChain::Wait(): Treat timeout of 0 as no timeout

Browse Source
This commit is contained in:
Kyle Edwards
2023-07-26 13:08:27 -04:00
parent 8129bf85ed
commit 830a4b37aa
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmUVProcessChain.cxx
View File

@@ -393,12 +393,12 @@ bool cmUVProcessChain::Valid() const
return this->Data->Valid;
}
bool cmUVProcessChain::Wait(int64_t milliseconds)
bool cmUVProcessChain::Wait(uint64_t milliseconds)
{
bool timeout = false;
cm::uv_timer_ptr timer;
if (milliseconds >= 0) {
if (milliseconds > 0) {
timer.init(*this->Data->Loop, &timeout);
timer.start(
[](uv_timer_t* handle) {

2
Source/cmUVProcessChain.h
View File

@@ -102,7 +102,7 @@ public:
int ErrorStream();
bool Valid() const;
bool Wait(int64_t milliseconds = -1);
bool Wait(uint64_t milliseconds = 0);
std::vector<const Status*> GetStatus() const;
const Status& GetStatus(std::size_t index) const;
bool Finished() const;

19
Tests/CMakeLib/testUVProcessChain.cxx
View File

@@ -652,6 +652,20 @@ bool testUVProcessChainInputFile(const char* helperCommand)
return true;
}
bool testUVProcessChainWait0(const char* helperCommand)
{
cmUVProcessChainBuilder builder;
builder.AddCommand({ helperCommand, "echo" });
auto chain = builder.Start();
if (!chain.Wait(0)) {
std::cout << "Wait(0) returned false, should be true" << std::endl;
return false;
}
return true;
}
int testUVProcessChain(int argc, char** const argv)
{
if (argc < 2) {
@@ -699,5 +713,10 @@ int testUVProcessChain(int argc, char** const argv)
return -1;
}
if (!testUVProcessChainWait0(argv[1])) {
std::cout << "While executing testUVProcessChainWait0().\n";
return -1;
}
return 0;
}