summaryrefslogtreecommitdiff
path: root/cpp/allTests.py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2013-04-04 16:02:42 -0700
committerMark Spruiell <mes@zeroc.com>2013-04-04 16:02:42 -0700
commit9cb665138c7d2422739e32b40a249c64fd3b6cd5 (patch)
tree94759d916599ca08761b98580185a230744ac67a /cpp/allTests.py
parentx64 VC10 icexml35d.dll was linked to wrong file (diff)
downloadice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.tar.bz2
ice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.tar.xz
ice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.zip
* SOCKS support for C++
* Minor cleanup in C# * Unity fixes
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 43500fbf8d5..edcb7533a8f 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -40,7 +40,7 @@ tests = [
("Ice/operations", ["core"]),
("Ice/exceptions", ["core"]),
("Ice/ami", ["core"]),
- ("Ice/info", ["core", "noipv6", "nocompress"]),
+ ("Ice/info", ["core", "noipv6", "nocompress", "nosocks"]),
("Ice/inheritance", ["core"]),
("Ice/facets", ["core"]),
("Ice/objects", ["core"]),
@@ -70,7 +70,7 @@ tests = [
("Ice/plugin", ["core", "nomingw"]),
("Ice/hash", ["once"]),
("Ice/admin", ["core", "noipv6"]),
- ("Ice/metrics", ["core", "nossl", "noipv6", "nocompress", "nomingw"]),
+ ("Ice/metrics", ["core", "nossl", "noipv6", "nocompress", "nomingw", "nosocks"]),
("Ice/enums", ["once"]),
("IceSSL/configuration", ["once", "novalgrind"]), # valgrind doesn't work well with openssl
("IceBox/configuration", ["core", "noipv6", "novc90", "nomingw", "nomx"]),