summaryrefslogtreecommitdiff
path: root/cpp/allTests.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-05-28 12:01:49 +0200
committerBenoit Foucher <benoit@zeroc.com>2015-05-28 12:01:49 +0200
commitf6854c7133fb10e2217b7ff79e577f6e98ca6b2d (patch)
tree19e2e025b2c5c82b1c56f60bf5d9440feb1288d2 /cpp/allTests.py
parentRemoved prepublish hook which doesn't work on Windows (diff)
downloadice-f6854c7133fb10e2217b7ff79e577f6e98ca6b2d.tar.bz2
ice-f6854c7133fb10e2217b7ff79e577f6e98ca6b2d.tar.xz
ice-f6854c7133fb10e2217b7ff79e577f6e98ca6b2d.zip
IceGrid/session test doesn't support running with wss (ICE-6539)
Diffstat (limited to 'cpp/allTests.py')
-rwxr-xr-xcpp/allTests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py
index 0450e42b3fc..1d192b5be8b 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -24,7 +24,7 @@ import TestUtil
#
# List of all basic tests.
#
-tests = [
+tests = [
("IceUtil/condvar", ["once", "win32only"]),
("IceUtil/thread", ["once"]),
("IceUtil/unicode", ["once"]),
@@ -98,7 +98,7 @@ tests = [
("IceGrid/simple", ["service", "novc100", "nomingw"]),
("IceGrid/fileLock", ["service", "novc100", "nomingw"]),
("IceGrid/deployer", ["service", "novc100", "nomingw"]),
- ("IceGrid/session", ["service", "novc100", "nomingw"]),
+ ("IceGrid/session", ["service", "novc100", "nomingw", "nows"]),
("IceGrid/update", ["service", "novc100", "nomingw"]),
("IceGrid/noRestartUpdate", ["service", "novc100", "nomingw"]),
("IceGrid/activation", ["service", "novc100", "nomingw"]),