diff options
author | Jose <jose@zeroc.com> | 2015-12-07 21:08:51 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2015-12-07 21:08:51 +0100 |
commit | acb6c5333de462e29d21166057fc074a815f2e3d (patch) | |
tree | 9acad37c34ef7b503f3aac13ea1858f1c965946c /scripts/TestUtil.py | |
parent | ICE-6897 - Add delegate metadata (diff) | |
download | ice-acb6c5333de462e29d21166057fc074a815f2e3d.tar.bz2 ice-acb6c5333de462e29d21166057fc074a815f2e3d.tar.xz ice-acb6c5333de462e29d21166057fc074a815f2e3d.zip |
C++11 mapping updates:
- Added missing __hash method
- Added missing virtual method Value::ice_clone
- Fixed issue with unmarshalling the idirection table
- Fixed default value initialization for scoped enums
- Fixed scoped enums mapping to use correct size types
- Added missing ice_id method to generated Value classes
- Fixed defaultValue, hash, networkProxy, plug-in,
stringConverter, threadPoolPriority and slicing/objects
tests to work with C++11 mapping
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-x | scripts/TestUtil.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index aae61979246..b721ffb2259 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1058,7 +1058,15 @@ def getCommandLineProperties(exe, config): if config.serialize: components.append("--Ice.ThreadPool.Server.Serialize=1") - if config.type == "server" or config.type == "colloc" and config.lang == "python": + # + # TODO + # config.lang == "cpp" required with C++11 mapping, we should be able to ged rid + # of this once AsyncResult is optimized to not required a thread pool thread with + # 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 + (config.lang == "python" or config.lang == "cpp")): components.append("--Ice.ThreadPool.Server.Size=1") components.append("--Ice.ThreadPool.Server.SizeMax=3") components.append("--Ice.ThreadPool.Server.SizeWarn=0") |