From 2a93c026962656d385b8b0d75c41af3d4fc7d9e5 Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Wed, 27 May 2015 13:06:06 +0200
Subject: Recuced the number of tests ran with --all

---
 scripts/TestUtil.py | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

(limited to 'scripts/TestUtil.py')

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 1c69736c11e..f2a2135de79 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -392,9 +392,9 @@ if not iceHome:
             thirdPartyHome = path[0]
 
 # List of supported cross languages test.
-crossTests = [ "Ice/adapterDeactivation",
+crossTests = [ #"Ice/adapterDeactivation",
                #"Ice/background",
-               "Ice/binding",
+               #"Ice/binding",
                #"Ice/checksum",
                #"Ice/custom",
                "Ice/ami",
@@ -402,16 +402,16 @@ crossTests = [ "Ice/adapterDeactivation",
                "Ice/exceptions",
                "Ice/enums",
                "Ice/facets",
-               "Ice/hold",
+               #"Ice/hold",
                "Ice/inheritance",
                "Ice/invoke",
-               "Ice/location",
+               #"Ice/location",
                "Ice/objects",
                "Ice/operations",
                "Ice/proxy",
-               "Ice/retry",
+               #"Ice/retry",
                "Ice/servantLocator",
-               "Ice/timeout",
+               #"Ice/timeout",
                "Ice/slicing/exceptions",
                "Ice/slicing/objects",
                "Ice/optional",
@@ -558,35 +558,17 @@ def run(tests, root = False):
         a = '--protocol=ws %s'  % arg
         expanded.append([ (test, a, config) for test,config in tests if "core" in config])
 
-        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])
-
-            a = "--ipv6 --protocol=ssl %s" % arg
-            expanded.append([ (test, a, config) for test,config in tests if "core" in config])
-
-            a = "--ipv6 --protocol=ws %s" % arg
+            a = "--ipv6 --protocol=wss --compress --mx --serialize %s" % arg
             expanded.append([ (test, a, config) for test,config in tests if "core" in config])
 
         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
+            a = "--ipv6 --protocol=wss --compress --mx --serialize %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])
 
-- 
cgit v1.2.3