diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-11-30 09:57:57 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-30 09:57:57 +0100 |
| commit | 45e126f45990269f78ae2daa4d7f6f98b3158abe (patch) | |
| tree | 5563875b6777234ed5497b66ffefcd77ffda3acc /scripts/Expect.py | |
| parent | ICE-5055 - demo/Ice/invoke bugs (diff) | |
| download | ice-45e126f45990269f78ae2daa4d7f6f98b3158abe.tar.bz2 ice-45e126f45990269f78ae2daa4d7f6f98b3158abe.tar.xz ice-45e126f45990269f78ae2daa4d7f6f98b3158abe.zip | |
Fixed ICE-5054 - don't rely anymore on exit status for Windows processed killed with Ctrl-Break
Diffstat (limited to 'scripts/Expect.py')
| -rwxr-xr-x | scripts/Expect.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/Expect.py b/scripts/Expect.py index f7eafd8cc95..872ea250078 100755 --- a/scripts/Expect.py +++ b/scripts/Expect.py @@ -453,9 +453,8 @@ class Expect (object): self.exitstatus = self.p.wait() - # A Windows application with a negative exit status means - # killed by CTRL_BREAK. Fudge the exit status. - if win32 and self.exitstatus < 0 and self.killed is not None: + # A Windows application killed with CTRL_BREAK. Fudge the exit status. + if win32 and self.killed is not None: self.exitstatus = -self.killed self.p = None self.r.join() |