diff options
-rw-r--r-- | llvm/utils/lit/lit/llvm/config.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/llvm/utils/lit/lit/llvm/config.py b/llvm/utils/lit/lit/llvm/config.py index 250bbbcd1c3..6a0bfa1b207 100644 --- a/llvm/utils/lit/lit/llvm/config.py +++ b/llvm/utils/lit/lit/llvm/config.py @@ -9,10 +9,6 @@ from lit.llvm.subst import FindTool from lit.llvm.subst import ToolSubst -def binary_feature(on, feature, off_prefix): - return feature if on else off_prefix + feature - - class LLVMConfig(object): def __init__(self, lit_config, config): @@ -73,13 +69,16 @@ class LLVMConfig(object): # Sanitizers. sanitizers = getattr(config, 'llvm_use_sanitizer', '') sanitizers = frozenset(x.lower() for x in sanitizers.split(';')) - features.add(binary_feature('address' in sanitizers, 'asan', 'not_')) - features.add(binary_feature('memory' in sanitizers, 'msan', 'not_')) - features.add(binary_feature( - 'undefined' in sanitizers, 'ubsan', 'not_')) + if 'address' in sanitizers: + features.add('asan') + if 'memory' in sanitizers: + features.add('msan') + if 'undefined' in sanitizers: + features.add('ubsan') have_zlib = getattr(config, 'have_zlib', None) - features.add(binary_feature(have_zlib, 'zlib', 'no')) + if have_zlib: + features.add('zlib') # Check if we should run long running tests. long_tests = lit_config.params.get('run_long_tests', None) |