diff options
author | Benoit Foucher <benoit@zeroc.com> | 2016-03-31 08:38:29 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2016-03-31 08:38:29 +0200 |
commit | 04c83affba981565fcca3b3bfa2a3d96ca331c81 (patch) | |
tree | 8cf749969ff9209645130bb8e4433d837c77c6d6 /cpp/allTests.py | |
parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
parent | Fixed Glacier2 bug which would cause hang on shutdown (diff) | |
download | ice-04c83affba981565fcca3b3bfa2a3d96ca331c81.tar.bz2 ice-04c83affba981565fcca3b3bfa2a3d96ca331c81.tar.xz ice-04c83affba981565fcca3b3bfa2a3d96ca331c81.zip |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/allTests.py')
-rwxr-xr-x | cpp/allTests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py index fb48f7630c6..49ca349425e 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -78,7 +78,7 @@ tests = [ ("Ice/enums", ["once", "bt"]), ("Ice/logger", ["once"]), ("Ice/networkProxy", ["core", "noipv6", "nosocks"]), - ("Ice/services", ["once"]), + ("Ice/services", ["once", "nomingw"]), ("IceSSL/configuration", ["once", "novalgrind"]), # valgrind doesn't work well with openssl ("IceBox/configuration", ["core", "noipv6", "novc100", "nomingw", "nomx"]), ("IceBox/admin", ["core", "noipv6", "novc100", "nomingw", "nomx"]), |