summaryrefslogtreecommitdiff
path: root/scripts/Expect.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-03-01 19:42:52 +0100
committerBenoit Foucher <benoit@zeroc.com>2017-03-01 19:42:52 +0100
commit0a57f0b1841f51bc45ff2adc9ac19e114d695e43 (patch)
tree2ecab85164a70618fc0f861058f97194cb4e797e /scripts/Expect.py
parentUWP build failure (diff)
downloadice-0a57f0b1841f51bc45ff2adc9ac19e114d695e43.tar.bz2
ice-0a57f0b1841f51bc45ff2adc9ac19e114d695e43.tar.xz
ice-0a57f0b1841f51bc45ff2adc9ac19e114d695e43.zip
Fixed ICE-7584 - discovery plugins now send multicast datagrams on all interfaces
Diffstat (limited to 'scripts/Expect.py')
-rwxr-xr-xscripts/Expect.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Expect.py b/scripts/Expect.py
index aacaf80258e..a3bf1962724 100755
--- a/scripts/Expect.py
+++ b/scripts/Expect.py
@@ -655,7 +655,7 @@ class Expect (object):
raise RuntimeError("unexpected exit status: expected: %d, got %d\n" % (expected, result))
self.wait(timeout)
- if self.mapping == "java":
+ if self.mapping in ["java", "java-compat"]:
if self.killed is not None:
if win32:
test(self.exitstatus, -self.killed)
@@ -674,6 +674,6 @@ class Expect (object):
def hasInterruptSupport(self):
"""Return True if the application gracefully terminated, False otherwise."""
- if win32 and self.mapping == "java":
+ if win32 and self.mapping in ["java", "java-compat"]:
return False
return True