From ec1aacaf5c9b5a9ff7ca7ab7a99b4c6bbdfb6fca Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Sat, 31 May 2014 01:36:02 +0000 Subject: Fix the behavior of ExecuteAndWait with a non-zero timeout. llvm-svn: 209951 --- llvm/lib/Support/Program.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'llvm/lib/Support/Program.cpp') diff --git a/llvm/lib/Support/Program.cpp b/llvm/lib/Support/Program.cpp index 83f2ec4f0fc..913c0997911 100644 --- a/llvm/lib/Support/Program.cpp +++ b/llvm/lib/Support/Program.cpp @@ -34,7 +34,8 @@ int sys::ExecuteAndWait(StringRef Program, const char **args, const char **envp, if (Execute(PI, Program, args, envp, redirects, memoryLimit, ErrMsg)) { if (ExecutionFailed) *ExecutionFailed = false; - ProcessInfo Result = Wait(PI, secondsToWait, true, ErrMsg); + ProcessInfo Result = Wait( + PI, secondsToWait, /*WaitUntilTerminates=*/secondsToWait == 0, ErrMsg); return Result.ReturnCode; } -- cgit v1.2.3