[libcxx] r224618 - Remove unneeded configuration code.

Eric Fiselier eric at efcs.ca
Fri Dec 19 13:42:17 PST 2014


Author: ericwf
Date: Fri Dec 19 15:42:17 2014
New Revision: 224618

URL: http://llvm.org/viewvc/llvm-project?rev=224618&view=rev
Log:
Remove unneeded configuration code.

Modified:
    libcxx/trunk/test/lit.cfg

Modified: libcxx/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/lit.cfg?rev=224618&r1=224617&r2=224618&view=diff
==============================================================================
--- libcxx/trunk/test/lit.cfg (original)
+++ libcxx/trunk/test/lit.cfg Fri Dec 19 15:42:17 2014
@@ -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





More information about the cfe-commits mailing list