diff options
| author | Joe George <joe@zeroc.com> | 2021-02-03 11:16:06 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2021-02-03 11:42:30 -0500 |
| commit | 48f9b28634908c43a23c30e219a9abfb038c1539 (patch) | |
| tree | 81420c7142bb57902ad96de1d057b5259c29a287 /scripts | |
| parent | IceGrid and IceStorm fixes (diff) | |
| download | ice-48f9b28634908c43a23c30e219a9abfb038c1539.tar.bz2 ice-48f9b28634908c43a23c30e219a9abfb038c1539.tar.xz ice-48f9b28634908c43a23c30e219a9abfb038c1539.zip | |
Additional C++11 fixes
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Component.py | 5 | ||||
| -rw-r--r-- | scripts/IceStormUtil.py | 2 | ||||
| -rw-r--r-- | scripts/Util.py | 3 | ||||
| -rw-r--r-- | scripts/tests/Glacier2/application.py | 2 | ||||
| -rw-r--r-- | scripts/tests/Glacier2/router.py | 2 | ||||
| -rw-r--r-- | scripts/tests/Glacier2/sessionHelper.py | 2 |
6 files changed, 12 insertions, 4 deletions
diff --git a/scripts/Component.py b/scripts/Component.py index 22304270b87..11995d71e14 100644 --- a/scripts/Component.py +++ b/scripts/Component.py @@ -145,6 +145,11 @@ class Ice(Component): if testId == "IceStorm/repgrid": return False + # No C++98 tests for IceBridge, IceGrid, IceStorm and Glacier2 + if isinstance(mapping, CppMapping) and not current.config.cpp11: + if parent in ["IceBridge", "IceGrid", "IceStorm", "Glacier2"]: + return False + if current.config.xamarin and not current.config.uwp: # # With Xamarin on Android and iOS Ice/udp is only supported with IPv4 diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py index f091de1c359..aa33c57361c 100644 --- a/scripts/IceStormUtil.py +++ b/scripts/IceStormUtil.py @@ -11,7 +11,7 @@ class IceStorm(ProcessFromBinDir, Server): def __init__(self, instanceName="IceStorm", replica=0, nreplicas=0, transient=False, portnum=0, createDb=True, cleanDb=True, *args, **kargs): - Server.__init__(self, exe="icebox", ready="IceStorm", mapping=Mapping.getByName("cpp"), *args, **kargs) + Server.__init__(self, exe="icebox++11", ready="IceStorm", mapping=Mapping.getByName("cpp"), *args, **kargs) self.portnum = portnum self.replica = replica self.nreplicas = nreplicas diff --git a/scripts/Util.py b/scripts/Util.py index e64b6b98f0a..a9d24326960 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -3187,6 +3187,9 @@ class CppMapping(Mapping): def __init__(self, options=[]): Mapping.Config.__init__(self, options) + # if self.buildConfig == platform.getDefaultBuildConfig(): + # self.buildConfig = "cpp98-shared" + # Derive from the build config the cpp11 option. This is used by canRun to allow filtering # tests on the cpp11 value in the testcase options specification self.cpp11 = self.buildConfig.lower().find("cpp11") >= 0 diff --git a/scripts/tests/Glacier2/application.py b/scripts/tests/Glacier2/application.py index 2b8886ebe4c..77d27b491cc 100644 --- a/scripts/tests/Glacier2/application.py +++ b/scripts/tests/Glacier2/application.py @@ -3,4 +3,4 @@ # Copyright (c) ZeroC, Inc. All rights reserved. # -Glacier2TestSuite(__name__, routerProps = { "Glacier2.SessionTimeout" : 30 }) +Glacier2TestSuite(__name__, routerProps = { "Glacier2.Client.ACM.Timeout" : 30 }) diff --git a/scripts/tests/Glacier2/router.py b/scripts/tests/Glacier2/router.py index a6245a800eb..a3b32fa7297 100644 --- a/scripts/tests/Glacier2/router.py +++ b/scripts/tests/Glacier2/router.py @@ -17,7 +17,7 @@ routerProps = { "Ice.Warn.Connections" : "0", "Glacier2.Filter.Category.Accept" : "c1 c2", "Glacier2.Filter.Category.AcceptUser" : "2", - "Glacier2.SessionTimeout" : "30", + "Glacier2.Client.ACM.Timeout" : "30", } traceProps = { diff --git a/scripts/tests/Glacier2/sessionHelper.py b/scripts/tests/Glacier2/sessionHelper.py index 2b8886ebe4c..77d27b491cc 100644 --- a/scripts/tests/Glacier2/sessionHelper.py +++ b/scripts/tests/Glacier2/sessionHelper.py @@ -3,4 +3,4 @@ # Copyright (c) ZeroC, Inc. All rights reserved. # -Glacier2TestSuite(__name__, routerProps = { "Glacier2.SessionTimeout" : 30 }) +Glacier2TestSuite(__name__, routerProps = { "Glacier2.Client.ACM.Timeout" : 30 }) |