[libcxx-commits] [libcxx] 4598a3c - [libc++] Move the long_tests Lit feature to the DSL

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-07-09T13:25:27-04:00
New Revision: 4598a3c7841bed32c21608a78b879e197f5002e2

URL: https://github.com/llvm/llvm-project/commit/4598a3c7841bed32c21608a78b879e197f5002e2
DIFF: https://github.com/llvm/llvm-project/commit/4598a3c7841bed32c21608a78b879e197f5002e2.diff

LOG: [libc++] Move the long_tests Lit feature to the DSL

Added: 
    

Modified: 
    libcxx/utils/libcxx/test/config.py
    libcxx/utils/libcxx/test/params.py

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py
index 909708b6a74a..5495aba72a26 100644
--- a/libcxx/utils/libcxx/test/config.py
+++ b/libcxx/utils/libcxx/test/config.py
@@ -74,7 +74,6 @@ def __init__(self, lit_config, config):
         self.use_target = False
         self.use_system_cxx_lib = self.get_lit_bool('use_system_cxx_lib', False)
         self.use_clang_verify = False
-        self.long_tests = None
 
     def get_lit_conf(self, name, default=None):
         val = self.lit_config.params.get(name, None)
@@ -285,18 +284,6 @@ def configure_features(self):
             self.config.available_features.add('availability=%s' % name)
             self.config.available_features.add('availability=%s%s' % (name, version))
 
-        # 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
-        self.long_tests = self.get_lit_bool('long_tests')
-        if self.long_tests is None:
-            # Default to running long tests.
-            self.long_tests = True
-            self.lit_config.note(
-                "inferred long_tests as: %r" % self.long_tests)
-
-        if self.long_tests:
-            self.config.available_features.add('long_tests')
-
         if self.target_info.is_windows():
             if self.cxx_stdlib_under_test == 'libc++':
                 # LIBCXX-WINDOWS-FIXME is the feature name used to XFAIL the

diff  --git a/libcxx/utils/libcxx/test/params.py b/libcxx/utils/libcxx/test/params.py
index bcc325dee3ed..2a83c4a5e39c 100644
--- a/libcxx/utils/libcxx/test/params.py
+++ b/libcxx/utils/libcxx/test/params.py
@@ -33,4 +33,8 @@
             help="Whether to enable tests for the C++ <filesystem> library.",
             feature=lambda filesystem: None if filesystem else
               Feature(name='c++filesystem-disabled')),
+
+  Parameter(name='long_tests', choices=[True, False], type=bool, default=True,
+            help="Whether to tests that take longer to run. This can be useful when running on a very slow device.",
+            feature=lambda enabled: Feature(name='long_tests') if enabled else None),
 ]