diff options
author | Eric Fiselier <eric@efcs.ca> | 2014-12-07 08:52:19 +0000 |
---|---|---|
committer | Eric Fiselier <eric@efcs.ca> | 2014-12-07 08:52:19 +0000 |
commit | 2764d046a1639553132dc7685b873d437fade099 (patch) | |
tree | f201b9e2b31b7708e1b6aa2910555bdddbc40688 | |
parent | 427f1a30149a7310726f8edaec434bb125d03db9 (diff) |
Give lit.cfg's threading options default values when not defined.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@223601 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | test/lit.cfg | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/lit.cfg b/test/lit.cfg index 56b1b36e9..80e15a877 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -202,10 +202,10 @@ class Configuration(object): val = default return val - def get_lit_bool(self, name): + def get_lit_bool(self, name, default=None): conf = self.get_lit_conf(name) if conf is None: - return None + return default if conf.lower() in ('1', 'true'): return True if conf.lower() in ('', '0', 'false'): @@ -415,9 +415,8 @@ class Configuration(object): '-D__STDC_LIMIT_MACROS', '-D__STDC_CONSTANT_MACROS'] # Configure threading features. - enable_threads = self.get_lit_bool('enable_threads') - enable_monotonic_clock = self.get_lit_bool('enable_monotonic_clock') - assert enable_threads is not None and enable_monotonic_clock is not None + enable_threads = self.get_lit_bool('enable_threads', True) + enable_monotonic_clock = self.get_lit_bool('enable_monotonic_clock', True) if not enable_threads: self.compile_flags += ['-D_LIBCPP_HAS_NO_THREADS'] self.config.available_features.add('libcpp-has-no-threads') |