diff options
| author | Mark Spruiell <mes@zeroc.com> | 2014-03-19 12:45:55 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2014-03-19 12:45:55 -0700 |
| commit | cdcffbcc3c3c052afdeb772ff0167e7a90b525bb (patch) | |
| tree | 4f16ee41ef7d33394c44e9db81e4d6cd89908250 /cpp/allTests.py | |
| parent | fixing testicedist.py for 5487 (diff) | |
| download | ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.bz2 ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.xz ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.zip | |
merging javascript branch
Diffstat (limited to 'cpp/allTests.py')
| -rwxr-xr-x | cpp/allTests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py index bf69d3496b2..6e746f700d8 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. @@ -57,7 +57,7 @@ tests = [ ("Ice/checksum", ["core"]), ("Ice/stream", ["core"]), ("Ice/hold", ["core"]), - ("Ice/custom", ["core", "nossl"]), + ("Ice/custom", ["core", "nossl", "nows"]), ("Ice/retry", ["core"]), ("Ice/timeout", ["core"]), ("Ice/background", ["core", "nomingw"]), @@ -71,7 +71,7 @@ tests = [ ("Ice/plugin", ["core", "nomingw"]), ("Ice/hash", ["once"]), ("Ice/admin", ["core", "noipv6"]), - ("Ice/metrics", ["core", "nossl", "noipv6", "nocompress", "nomingw", "nosocks"]), + ("Ice/metrics", ["core", "nossl", "nows", "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"]), @@ -100,7 +100,7 @@ tests = [ ("IceGrid/replication", ["service", "novc90", "nomingw", "nomx"]), ("IceGrid/allocation", ["service", "novc90", "nomingw"]), ("IceGrid/distribution", ["service", "novc90", "nomingw"]), - ("IceGrid/admin", ["service", "novc90", "nomingw"]), + ("IceGrid/admin", ["service", "novc90", "nomingw","nows"]), ("Glacier2/router", ["service", "novc90", "nomingw"]), ("Glacier2/attack", ["service", "novc90", "nomingw", "nomx"]), ("Glacier2/override", ["service", "novc90", "nomingw"]), |