diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-12-28 18:51:38 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-12-28 18:51:38 +0100 |
| commit | 0d8fee4e74979a95ed353ed5f45fbd6ed0a6cba4 (patch) | |
| tree | f7bde5f1f00a453bcccfc2c9148e8ecdcc317a75 /scripts/TestUtil.py | |
| parent | Fixed remaining use of Ice.ConnectionCallback in Python Glacier2.Application (diff) | |
| download | ice-0d8fee4e74979a95ed353ed5f45fbd6ed0a6cba4.tar.bz2 ice-0d8fee4e74979a95ed353ed5f45fbd6ed0a6cba4.tar.xz ice-0d8fee4e74979a95ed353ed5f45fbd6ed0a6cba4.zip | |
Don't run tests with bluetooth on non-Linux platforms
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index b712a50d10d..86cee571f94 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -569,8 +569,9 @@ def run(tests, root = False): a = '--protocol=ws %s' % arg expanded.append([ (test, a, config) for test,config in tests if "core" in config]) - a = '--protocol=bt %s' % arg - expanded.append([ (test, a, config) for test,config in tests if "core" in config]) + if isLinux(): + a = '--protocol=bt %s' % arg + expanded.append([ (test, a, config) for test,config in tests if "core" in config]) if not noipv6: a = "--ipv6 --protocol=wss --compress --mx --serialize %s" % arg @@ -1083,7 +1084,7 @@ def getCommandLineProperties(exe, config, cfgName): # collocated calls and C++11 mapping. We must also check if it still required for # python. # - if (config.type == "server" or config.type == "colloc" and + if (config.type == "server" or config.type == "colloc" and (config.lang == "python" or config.lang == "cpp")): components.append("--Ice.ThreadPool.Server.Size=1") components.append("--Ice.ThreadPool.Server.SizeMax=3") |