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 | bfe17408a9bcad9cbb29ff0dafb8a7674a7c09a6 (patch) | |
| tree | c4805b107aea8b61ab69711651c592bcb30de54a /lib/Support/Program.cpp | |
| parent | c3648ce2dca6d9a0a86ce4d736c24b896a9ad7a6 (diff) | |
| download | llvm-bfe17408a9bcad9cbb29ff0dafb8a7674a7c09a6.tar.gz llvm-bfe17408a9bcad9cbb29ff0dafb8a7674a7c09a6.tar.bz2 llvm-bfe17408a9bcad9cbb29ff0dafb8a7674a7c09a6.tar.xz | |
Fix the behavior of ExecuteAndWait with a non-zero timeout.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@209951 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support/Program.cpp')
| -rw-r--r-- | lib/Support/Program.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Support/Program.cpp b/lib/Support/Program.cpp index 83f2ec4f0f..913c099791 100644 --- a/lib/Support/Program.cpp +++ b/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; } |