diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2014-05-31 01:36:02 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2014-05-31 01:36:02 +0000 |
| commit | ec1aacaf5c9b5a9ff7ca7ab7a99b4c6bbdfb6fca (patch) | |
| tree | 8f73b4cd80d324cdac39ecdeaf4636924acf9daa /llvm/lib/Support/Program.cpp | |
| parent | 613807b4d0c19b5ebd3fd3a5bc106d4a34324cc5 (diff) | |
| download | bcm5719-llvm-ec1aacaf5c9b5a9ff7ca7ab7a99b4c6bbdfb6fca.tar.gz bcm5719-llvm-ec1aacaf5c9b5a9ff7ca7ab7a99b4c6bbdfb6fca.zip | |
Fix the behavior of ExecuteAndWait with a non-zero timeout.
llvm-svn: 209951
Diffstat (limited to 'llvm/lib/Support/Program.cpp')
| -rw-r--r-- | llvm/lib/Support/Program.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |
