diff options
| author | Joe George <joe@zeroc.com> | 2021-03-04 16:43:30 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2021-03-04 16:43:30 -0500 |
| commit | 237b0e2c1ac9c594cf41763fb060576001649e47 (patch) | |
| tree | 4d7e66b9a08f8b7eddc02a61a8a1fcf0739b365f /scripts/Component.py | |
| parent | Make fixes for c++98 dependencies (diff) | |
| download | ice-237b0e2c1ac9c594cf41763fb060576001649e47.tar.bz2 ice-237b0e2c1ac9c594cf41763fb060576001649e47.tar.xz ice-237b0e2c1ac9c594cf41763fb060576001649e47.zip | |
Skip C++11 service tests if not using cpp11 config
Diffstat (limited to 'scripts/Component.py')
| -rw-r--r-- | scripts/Component.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Component.py b/scripts/Component.py index 11995d71e14..762ec6fcde9 100644 --- a/scripts/Component.py +++ b/scripts/Component.py @@ -146,9 +146,9 @@ class Ice(Component): 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 + cpp11 = current.driver.configs[Mapping.getByName("cpp")].cpp11 + if parent in ["IceBridge", "IceGrid", "IceStorm", "Glacier2"] and not cpp11: + return False if current.config.xamarin and not current.config.uwp: # |