diff options
| author | Jose <jose@zeroc.com> | 2013-08-29 15:14:09 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-08-29 15:14:09 +0200 |
| commit | 822c483b29a76cd4e45a77a686406e1d745794e7 (patch) | |
| tree | 6026030e9df268099bf6ea2288c19b0be8ea5af2 /scripts/TestUtil.py | |
| parent | IcePatch2 minor fix - ensure we always close the log file (diff) | |
| download | ice-822c483b29a76cd4e45a77a686406e1d745794e7.tar.bz2 ice-822c483b29a76cd4e45a77a686406e1d745794e7.tar.xz ice-822c483b29a76cd4e45a77a686406e1d745794e7.zip | |
Installer & test script fixes.
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 45c24174ed9..270c0ab54e6 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1842,11 +1842,18 @@ def runTests(start, expanded, num = 0, script = False): print("%s*** test not supported with SOCKS%s" % (prefix, suffix)) continue - if args.find("compact") != -1 and "nocompact" in config: + if args.find("compact") != -1 and \ + ("nocompact" in config or + args.find("ssl") != -1 + args.find("compress") != -1): print("%s*** test not supported with Compact Framework%s" % (prefix, suffix)) continue - if args.find("silverlight") != -1 and "nosilverlight" in config: + if args.find("silverlight") != -1 and \ + ("nosilverlight" in config or \ + args.find("ssl") != -1 or \ + args.find("mx") != -1 or \ + args.find("compress") != -1): print("%s*** test not supported with Silverlight%s" % (prefix, suffix)) continue |