summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-02-21 15:12:22 +0100
committerJose <jose@zeroc.com>2012-02-21 15:12:22 +0100
commita88c32a39e09573d08d5426e50cdb6bff29ad14b (patch)
tree597ef891b8165bb8458f42e44039d6fb10d002ac /scripts/TestUtil.py
parentICE-4322 - Use "#pragma once" in Slice files (diff)
downloadice-a88c32a39e09573d08d5426e50cdb6bff29ad14b.tar.bz2
ice-a88c32a39e09573d08d5426e50cdb6bff29ad14b.tar.xz
ice-a88c32a39e09573d08d5426e50cdb6bff29ad14b.zip
ICE-4588 - DynamicLibrary & LoadLibraryW
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index a20218479b0..85b6058810d 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1609,6 +1609,10 @@ def runTests(start, expanded, num = 0, script = False):
print "%s*** test not supported with mono%s" % (prefix, suffix)
continue
+ if args.find("ssl") != -1 and ("nossl" in config):
+ 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)