summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-10-26 12:22:35 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-10-26 12:22:35 +0200
commit4ec78c197d7c03e5aa3a27a7c81dd1edf6c31b59 (patch)
treef59b4c9901e9e21b54153bade335f76123e9440a /scripts/TestUtil.py
parentDon't run the metrics test with --compress (diff)
downloadice-4ec78c197d7c03e5aa3a27a7c81dd1edf6c31b59.tar.bz2
ice-4ec78c197d7c03e5aa3a27a7c81dd1edf6c31b59.tar.xz
ice-4ec78c197d7c03e5aa3a27a7c81dd1edf6c31b59.zip
Fix for Java metrics tests, added --mx to allTests.py --all option
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index e34c641b4d3..e09eb2af42f 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -433,6 +433,9 @@ def run(tests, root = False):
a = '--protocol=tcp --compress %s' % arg
expanded.append([ (test, a, config) for test,config in tests if "core" in config])
+ a = '--mx %s' % arg
+ expanded.append([ (test, a, config) for test,config in tests if "core" in config])
+
if not noipv6:
a = "--ipv6 --protocol=tcp %s" % arg
expanded.append([ (test, a, config) for test,config in tests if "core" in config])
@@ -443,12 +446,16 @@ def run(tests, root = False):
a = "--protocol=tcp %s" % arg
expanded.append([ (test, a, config) for test,config in tests if "service" in config])
+ a = '--mx %s' % arg
+ expanded.append([ (test, a, config) for test,config in tests if "service" in config])
+
if not noipv6:
a = "--protocol=ssl --ipv6 %s" % arg
expanded.append([ (test, a, config) for test,config in tests if "service" in config])
a = "--protocol=tcp --serialize %s" % arg
expanded.append([ (test, a, config) for test,config in tests if "stress" in config])
+
elif not allCross:
expanded.append([ (test, arg, config) for test,config in tests])