|
@@ -420,16 +420,6 @@ class Configuration(object):
|
|
|
self.config.available_features.add(
|
|
|
'with_system_lib=%s' % self.config.target_triple)
|
|
|
|
|
|
- # TODO 6/12/2014: Remove these once the buildmaster restarts.
|
|
|
- # Removing before will break the bot that tests libcpp-has-no-threads.
|
|
|
- if 'libcpp-has-no-threads' in self.config.available_features \
|
|
|
- and '-D_LIBCPP_HAS_NO_THREADS' not in self.compile_flags:
|
|
|
- self.compile_flags += ['-D_LIBCPP_HAS_NO_THREADS']
|
|
|
-
|
|
|
- if 'libcpp-has-no-monotonic-clock' in self.config.available_features \
|
|
|
- and '-D_LIBCPP_HAS_NO_MONOTONIC_CLOCK' not in self.compile_flags:
|
|
|
- self.compile_flags += ['-D_LIBCPP_HAS_NO_MONOTONIC_CLOCK']
|
|
|
-
|
|
|
# Some linux distributions have different locale data than others.
|
|
|
# Insert the distributions name and name-version into the available
|
|
|
# features to allow tests to XFAIL on them.
|
|
@@ -437,8 +427,10 @@ class Configuration(object):
|
|
|
name, ver, _ = platform.linux_distribution()
|
|
|
name = name.lower().strip()
|
|
|
ver = ver.lower().strip()
|
|
|
- self.config.available_features.add(name)
|
|
|
- self.config.available_features.add('%s-%s' % (name, ver))
|
|
|
+ if name:
|
|
|
+ self.config.available_features.add(name)
|
|
|
+ if name and ver:
|
|
|
+ self.config.available_features.add('%s-%s' % (name, ver))
|
|
|
|
|
|
# Simulator testing can take a really long time for some of these tests
|
|
|
# so add a feature check so we can REQUIRES: long_tests in them
|