summaryrefslogtreecommitdiff
path: root/scripts/Expect.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-11-30 13:30:26 +0100
committerBenoit Foucher <benoit@zeroc.com>2012-11-30 13:30:26 +0100
commit2103d078f2edb7d60fcc338505b0baa103adbeba (patch)
treeacec72d642973aff39dce84e131552601a3f341b /scripts/Expect.py
parentFixed (ICE-5060) - There isn't demovb scripts in Ice-3.5b-demo-scripts.tar.gz (diff)
downloadice-2103d078f2edb7d60fcc338505b0baa103adbeba.tar.bz2
ice-2103d078f2edb7d60fcc338505b0baa103adbeba.tar.xz
ice-2103d078f2edb7d60fcc338505b0baa103adbeba.zip
Fixed ICE-5061 - Fixed previous fix for Windows exit status issue
Diffstat (limited to 'scripts/Expect.py')
-rwxr-xr-xscripts/Expect.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Expect.py b/scripts/Expect.py
index 872ea250078..0f104ccb56f 100755
--- a/scripts/Expect.py
+++ b/scripts/Expect.py
@@ -454,7 +454,7 @@ class Expect (object):
self.exitstatus = self.p.wait()
# A Windows application killed with CTRL_BREAK. Fudge the exit status.
- if win32 and self.killed is not None:
+ if win32 and self.exitstatus != 0 and self.killed is not None:
self.exitstatus = -self.killed
self.p = None
self.r.join()