LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix libcxx tests after clang r334677.

Browse Source 
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
This commit is contained in:
Richard Smith
2018-06-17 19:58:45 +00:00
parent 8d00e543f4
commit 5aa278078e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/libcxx/test/config.py
View File

@@ -50,6 +50,11 @@ def loadSiteConfig(lit_config, config, param_name, env_name):
ld_fn(config, site_cfg) ld_fn(config, site_cfg)
lit_config.load_config = ld_fn 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): class Configuration(object):
# pylint: disable=redefined-outer-name # pylint: disable=redefined-outer-name
def __init__(self, lit_config, config): def __init__(self, lit_config, config):
@@ -464,7 +469,7 @@ class Configuration(object):
self.config.available_features.add('libcpp-no-structured-bindings') self.config.available_features.add('libcpp-no-structured-bindings')
if '__cpp_deduction_guides' not in macros or \ 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') self.config.available_features.add('libcpp-no-deduction-guides')
if self.is_windows: if self.is_windows:
@@ -1012,8 +1017,7 @@ class Configuration(object):
'__cpp_coroutines is not defined') '__cpp_coroutines is not defined')
# Consider coroutines supported only when the feature test macro # Consider coroutines supported only when the feature test macro
# reflects a recent value. # reflects a recent value.
val = macros['__cpp_coroutines'].replace('L', '') if intMacroValue(macros['__cpp_coroutines']) >= 201703:
if int(val) >= 201703:
self.config.available_features.add('fcoroutines-ts') self.config.available_features.add('fcoroutines-ts')
def configure_modules(self): def configure_modules(self):