summaryrefslogtreecommitdiff
path: root/cpp/allTests.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-06-27 11:56:51 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-06-27 11:56:51 +0200
commit433e5f292b9f94929bbf68b5c68f3dda9b1f9aba (patch)
treefd661e2775de907c0dc039ce6378b84cdf36f961 /cpp/allTests.py
parentFixed ICE-5538: removed virtual inheritance (diff)
downloadice-433e5f292b9f94929bbf68b5c68f3dda9b1f9aba.tar.bz2
ice-433e5f292b9f94929bbf68b5c68f3dda9b1f9aba.tar.xz
ice-433e5f292b9f94929bbf68b5c68f3dda9b1f9aba.zip
Fix ICE-5564 - disable timeout test when ran with compression
Diffstat (limited to 'cpp/allTests.py')
-rwxr-xr-xcpp/allTests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py
index 379a4fc2aff..cb98545e02e 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -59,7 +59,7 @@ tests = [
("Ice/hold", ["core"]),
("Ice/custom", ["core", "nossl", "nows"]),
("Ice/retry", ["core"]),
- ("Ice/timeout", ["core"]),
+ ("Ice/timeout", ["core", "nocompress"]),
("Ice/acm", ["core"]),
("Ice/background", ["core", "nomingw"]),
("Ice/servantLocator", ["core"]),