summaryrefslogtreecommitdiff
path: root/cpp/allTests.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-09-10 08:47:19 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-09-10 08:47:19 +0200
commitb6c9d9a880f6f1a6908a3c62dfccdce3e68dad80 (patch)
treed3e9e9340064538a8dc7a645260d0eb3cdf55d63 /cpp/allTests.py
parentUndo bogus change from an earlier commit. (diff)
downloadice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.tar.bz2
ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.tar.xz
ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.zip
ICE-5582 (SOCKs test), ICE-5314 (HTTP proxies), major refactoring of networking code (addition of StreamSocket class abstraction)
Diffstat (limited to 'cpp/allTests.py')
-rwxr-xr-xcpp/allTests.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py
index 854a691bf28..a7dce5ee529 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -46,7 +46,7 @@ tests = [
("Ice/facets", ["core"]),
("Ice/objects", ["core"]),
("Ice/optional", ["core"]),
- ("Ice/binding", ["core"]),
+ ("Ice/binding", ["core", "nosocks"]),
("Ice/faultTolerance", ["core", "novalgrind"]), # valgrind reports leak with aborted servers
("Ice/location", ["core"]),
("Ice/adapterDeactivation", ["core"]),
@@ -59,9 +59,9 @@ tests = [
("Ice/hold", ["core"]),
("Ice/custom", ["core", "nossl", "nows"]),
("Ice/retry", ["core"]),
- ("Ice/timeout", ["core", "nocompress"]),
+ ("Ice/timeout", ["core", "nocompress", "nosocks"]),
("Ice/acm", ["core"]),
- ("Ice/background", ["core", "nomingw"]),
+ ("Ice/background", ["core", "nomingw", "nosocks"]),
("Ice/servantLocator", ["core"]),
("Ice/interceptor", ["core"]),
("Ice/stringConverter", ["core"]),
@@ -75,6 +75,7 @@ tests = [
("Ice/metrics", ["core", "nossl", "nows", "noipv6", "nocompress", "nomingw", "nosocks"]),
("Ice/enums", ["once"]),
("Ice/logger", ["once"]),
+ ("Ice/networkProxy", ["core", "noipv6", "nosocks"]),
("IceSSL/configuration", ["once", "novalgrind"]), # valgrind doesn't work well with openssl
("IceBox/configuration", ["core", "noipv6", "novc90", "nomingw", "nomx"]),
("IceBox/admin", ["core", "noipv6", "novc90", "nomingw", "nomx"]),