diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2018-06-17 19:58:45 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2018-06-17 19:58:45 +0000 |
| commit | 5aa278078ee593388123e1dedda6e9da06df5253 (patch) | |
| tree | 6c6538560e4ea703176cc4d49d814295e3f95fff | |
| parent | 8d00e543f454a4b40dafc1fc87419df88aaee829 (diff) | |
| download | external_libcxx-5aa278078ee593388123e1dedda6e9da06df5253.tar.gz external_libcxx-5aa278078ee593388123e1dedda6e9da06df5253.tar.bz2 external_libcxx-5aa278078ee593388123e1dedda6e9da06df5253.zip | |
Fix libcxx tests after clang r334677.
Feature test macro versions may have a trailing L.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@334917 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | utils/libcxx/test/config.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/utils/libcxx/test/config.py b/utils/libcxx/test/config.py index 2af4a473e..73357b8ab 100644 --- a/utils/libcxx/test/config.py +++ b/utils/libcxx/test/config.py @@ -50,6 +50,11 @@ def loadSiteConfig(lit_config, config, param_name, env_name): ld_fn(config, site_cfg) lit_config.load_config = ld_fn +# Extract the value of a numeric macro such as __cplusplus or a feature-test +# macro. +def intMacroValue(token): + return int(token.rstrip('LlUu')) + class Configuration(object): # pylint: disable=redefined-outer-name def __init__(self, lit_config, config): @@ -464,7 +469,7 @@ class Configuration(object): self.config.available_features.add('libcpp-no-structured-bindings') if '__cpp_deduction_guides' not in macros or \ - int(macros['__cpp_deduction_guides']) < 201611: + intMacroValue(macros['__cpp_deduction_guides']) < 201611: self.config.available_features.add('libcpp-no-deduction-guides') if self.is_windows: @@ -1012,8 +1017,7 @@ class Configuration(object): '__cpp_coroutines is not defined') # Consider coroutines supported only when the feature test macro # reflects a recent value. - val = macros['__cpp_coroutines'].replace('L', '') - if int(val) >= 201703: + if intMacroValue(macros['__cpp_coroutines']) >= 201703: self.config.available_features.add('fcoroutines-ts') def configure_modules(self): |