summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-10-22 11:56:37 -0400
committerBernard Normier <bernard@zeroc.com>2012-10-22 11:56:37 -0400
commit181203fadb41522d72a6a493f4bbae3cdd8efe0c (patch)
tree6733c16b84074047c370143d9a30a92f44bd3d31 /scripts/TestUtil.py
parentClarified CLASSPATH setting in README.DEMOS (ICE-4797) (diff)
parentFixed ICE-4556 - --interface option not working on some platforms, enabled Ja... (diff)
downloadice-181203fadb41522d72a6a493f4bbae3cdd8efe0c.tar.bz2
ice-181203fadb41522d72a6a493f4bbae3cdd8efe0c.tar.xz
ice-181203fadb41522d72a6a493f4bbae3cdd8efe0c.zip
Merge branch 'master' of ssh://git/home/git/ice
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 95a92d1e0c6..67d3be026cd 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1752,11 +1752,6 @@ def runTests(start, expanded, num = 0, script = False):
print("%s*** test not supported with IceSSL%s" % (prefix, suffix))
continue
- # If this is java and we're running ipv6 under windows then skip.
- if isWin32() and i.find(os.path.join("java","test")) != -1 and args.find("ipv6") != -1:
- print("%s*** test not supported under windows%s" % (prefix, suffix))
- continue
-
# Skip tests not supported by valgrind
if args.find("valgrind") != -1 and ("novalgrind" in config or args.find("ssl") != -1):
print("%s*** test not supported with valgrind%s" % (prefix, suffix))