summaryrefslogtreecommitdiff
path: root/cpp/allTests.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-10-16 12:15:14 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-10-16 12:15:14 +0200
commit1edb603754a8ab3922a3b9b8c69e0dd3614e0dab (patch)
treed5d56c91a42187cbd68b0dcf65e95eab68cde22d /cpp/allTests.py
parentICE-4856 - Fix multicast for JDK 7 (diff)
downloadice-1edb603754a8ab3922a3b9b8c69e0dd3614e0dab.tar.bz2
ice-1edb603754a8ab3922a3b9b8c69e0dd3614e0dab.tar.xz
ice-1edb603754a8ab3922a3b9b8c69e0dd3614e0dab.zip
Fixed IceMX race condition, VC9 build
Diffstat (limited to 'cpp/allTests.py')
-rwxr-xr-xcpp/allTests.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py
index 340a1772e85..ab5f6b14254 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -72,8 +72,8 @@ tests = [
("Ice/admin", ["core"]),
("Ice/metrics", ["core", "nossl", "noipv6"]),
("IceSSL/configuration", ["once", "novalgrind"]), # valgrind doesn't work well with openssl
- ("IceBox/configuration", ["core", "noipv6", "novc6", "nomingw"]),
- ("IceBox/admin", ["core", "noipv6", "novc6", "nomingw"]),
+ ("IceBox/configuration", ["core", "noipv6", "novc6", "nomingw", "nomx"]),
+ ("IceBox/admin", ["core", "noipv6", "novc6", "nomingw", "nomx"]),
("Freeze/dbmap", ["once", "novc6", "nomingw"]),
("Freeze/complex", ["once", "novc6", "nomingw"]),
("Freeze/evictor", ["core", "novc6", "nomingw"]),
@@ -95,17 +95,17 @@ tests = [
("IceGrid/noRestartUpdate", ["service", "novc6", "nomingw"]),
("IceGrid/activation", ["service", "novc6", "nomingw"]),
("IceGrid/replicaGroup", ["service", "novc6", "nomingw"]),
- ("IceGrid/replication", ["service", "novc6", "nomingw"]),
+ ("IceGrid/replication", ["service", "novc6", "nomingw", "nomx"]),
("IceGrid/allocation", ["service", "novc6", "nomingw"]),
("IceGrid/distribution", ["service", "novc6", "nomingw"]),
("IceGrid/admin", ["service", "novc6", "nomingw"]),
("Glacier2/router", ["service", "novc6", "nomingw"]),
- ("Glacier2/attack", ["service", "novc6", "nomingw"]),
+ ("Glacier2/attack", ["service", "novc6", "nomingw", "nomx"]),
("Glacier2/override", ["service", "novc6", "nomingw"]),
("Glacier2/sessionControl", ["service", "novc6", "nomingw"]),
("Glacier2/ssl", ["service", "novalgrind", "novc6", "nomingw"]), # valgrind doesn't work well with openssl
("Glacier2/dynamicFiltering", ["service", "novc6", "nomingw"]),
- ("Glacier2/staticFiltering", ["service", "noipv6", "novc6", "nomingw"]),
+ ("Glacier2/staticFiltering", ["service", "noipv6", "novc6", "nomingw", "nomx"]),
("Glacier2/sessionHelper", ["service", "novc6", "nomingw"]),
]