summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-11-25 19:12:55 +0100
committerJose <jose@zeroc.com>2014-11-25 19:12:55 +0100
commitee6c89bb5a553e7d36c7e7db069590c345e37378 (patch)
treeb540414a966cb035b63ce8b814f180f6fd14aaf0 /scripts/TestUtil.py
parentICE-5982 IceStorm/single failure (diff)
downloadice-ee6c89bb5a553e7d36c7e7db069590c345e37378.tar.bz2
ice-ee6c89bb5a553e7d36c7e7db069590c345e37378.tar.xz
ice-ee6c89bb5a553e7d36c7e7db069590c345e37378.zip
Appverifier support updates
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 91959df5301..87b32ef6f73 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1250,9 +1250,9 @@ def setAppVerifierSettings(targets, cwd=os.getcwd()):
verifier.expect(matchAppVerifierSuccess(), -1)
#Now disable all tests we are not intested in
- cmd = "appverif -disable LuaPriv PrintDriver PrintApi -for " + exe
+ cmd = "appverif -disable LuaPriv PrintDriver PrintApi Networking HighVersionLie -for " + exe
verifier = _spawn(cmd, cwd=cwd)
- verifier.expectall(["Application Verifier 4.0","",""], -1)
+ verifier.expectall(["Application Verifier","",""], -1)
def appVerifierAfterTestEnd(targets, cwd=os.getcwd()):
for exe in targets:
@@ -2201,8 +2201,7 @@ def runTests(start, expanded, num = 0, script = False):
continue
# Skip tests not supported by appverifier
- if args.find("appverifier") != -1 and ("noappverifier" in config or args.find("ssl") != -1 or
- args.find("wss") != -1):
+ if args.find("appverifier") != -1 and ("noappverifier" in config):
print("%s*** test not supported with appverifier%s" % (prefix, suffix))
continue