[libc++][WIP] Move the libc++ test format to Lit

This allows the generally-useful parts of the test format to be
shipped alongside Lit, which would make it usable for third-party
developers as well. This came up at C++Now in the context of the
Beman project where we'd like to set up a non-LLVM project that can
use the same testing framework as libc++.

With the test format moved to Lit, the format would be available
after installing Lit with pip, which is really convenient.

Author: ldionne

libcxx/test/configs/cmake-bridge.cfg.in

@@ -18,7 +18,7 @@ import libcxx.test.format
 # Basic configuration of the test suite
 config.name = os.path.basename('@LIBCXX_TEST_CONFIG@')
 config.test_source_root = os.path.join('@LIBCXX_SOURCE_DIR@', 'test')
-config.test_format = libcxx.test.format.CxxStandardLibraryTest()
+config.test_format = libcxx.test.format.LibcxxTest()
 config.recursiveExpansionLimit = 10
 config.test_exec_root = os.path.join('@CMAKE_BINARY_DIR@', 'test')
 

libcxx/utils/libcxx/test/config.py

@@ -7,18 +7,7 @@
 # ===----------------------------------------------------------------------===##
 
 import os
-
-
-def _getSubstitution(substitution, config):
-    for (orig, replacement) in config.substitutions:
-        if orig == substitution:
-            return replacement
-    raise ValueError("Substitution {} is not in the config.".format(substitution))
-
-
-def _appendToSubstitution(substitutions, key, value):
-    return [(k, v + " " + value) if k == key else (k, v) for (k, v) in substitutions]
-
+import lit.formats
 
 def configure(parameters, features, config, lit_config):
     note = lambda s: lit_config.note("({}) {}".format(config.name, s))
@@ -53,7 +42,7 @@ def configure(parameters, features, config, lit_config):
 
     # Print the basic substitutions
     for sub in ("%{cxx}", "%{flags}", "%{compile_flags}", "%{link_flags}", "%{exec}"):
-        note("Using {} substitution: '{}'".format(sub, _getSubstitution(sub, config)))
+        note("Using {} substitution: '{}'".format(sub, lit.formats.standardlibrarytest._getSubstitution(sub, config)))
 
     # Print all available features
     note("All available features: {}".format(", ".join(sorted(config.available_features))))

libcxx/utils/libcxx/test/dsl.py

@@ -13,8 +13,8 @@
 import shutil
 import tempfile
 
-import libcxx.test.format
 import lit
+import lit.formats
 import lit.LitConfig
 import lit.Test
 import lit.TestRunner
@@ -99,7 +99,7 @@ def _executeWithFakeConfig(test, commands):
         order="smart",
         params={},
     )
-    return libcxx.test.format._executeScriptInternal(test, litConfig, commands)
+    return lit.formats.standardlibrarytest._executeScriptInternal(test, litConfig, commands)
 
 
 def _makeConfigTest(config):
@@ -121,12 +121,12 @@ def _makeConfigTest(config):
 
     class TestWrapper(lit.Test.Test):
         def __enter__(self):
-            testDir, _ = libcxx.test.format._getTempPaths(self)
+            testDir, _ = lit.formats.standardlibrarytest._getTempPaths(self)
             os.makedirs(testDir)
             return self
 
         def __exit__(self, *args):
-            testDir, _ = libcxx.test.format._getTempPaths(self)
+            testDir, _ = lit.formats.standardlibrarytest._getTempPaths(self)
             shutil.rmtree(testDir)
             os.remove(tmp.name)
 
@@ -348,18 +348,6 @@ def featureTestMacros(config, flags=""):
     }
 
 
-def _getSubstitution(substitution, config):
-  for (orig, replacement) in config.substitutions:
-    if orig == substitution:
-      return replacement
-  raise ValueError('Substitution {} is not in the config.'.format(substitution))
-
-def _appendToSubstitution(substitutions, key, value):
-    return [(k, v + " " + value) if k == key else (k, v) for (k, v) in substitutions]
-
-def _prependToSubstitution(substitutions, key, value):
-    return [(k, value + " " + v) if k == key else (k, v) for (k, v) in substitutions]
-
 def _ensureFlagIsSupported(config, flag):
     (exitCode, out, err) = tryCompileFlag(config, flag)
     assert (
@@ -442,7 +430,7 @@ def __init__(self, flag):
     def applyTo(self, config):
         flag = self._getFlag(config)
         _ensureFlagIsSupported(config, flag)
-        config.substitutions = _appendToSubstitution(
+        config.substitutions = lit.formats.standardlibrarytest._appendToSubstitution(
             config.substitutions, "%{flags}", flag
         )
 
@@ -464,7 +452,7 @@ def __init__(self, flag):
     def applyTo(self, config):
         flag = self._getFlag(config)
         if hasCompileFlag(config, flag):
-            config.substitutions = _appendToSubstitution(
+            config.substitutions = lit.formats.standardlibrarytest._appendToSubstitution(
                 config.substitutions, "%{flags}", flag
             )
 
@@ -486,7 +474,7 @@ def __init__(self, flag):
     def applyTo(self, config):
         flag = self._getFlag(config)
         _ensureFlagIsSupported(config, flag)
-        config.substitutions = _appendToSubstitution(
+        config.substitutions = lit.formats.standardlibrarytest._appendToSubstitution(
             config.substitutions, "%{compile_flags}", flag
         )
 
@@ -508,7 +496,7 @@ def __init__(self, flag):
     def applyTo(self, config):
         flag = self._getFlag(config)
         _ensureFlagIsSupported(config, flag)
-        config.substitutions = _appendToSubstitution(
+        config.substitutions = lit.formats.standardlibrarytest._appendToSubstitution(
             config.substitutions, "%{link_flags}", flag
         )
 
@@ -530,7 +518,7 @@ def __init__(self, flag):
     def applyTo(self, config):
         flag = self._getFlag(config)
         _ensureFlagIsSupported(config, flag)
-        config.substitutions = _prependToSubstitution(
+        config.substitutions = lit.formats.standardlibrarytest._prependToSubstitution(
             config.substitutions, "%{link_flags}", flag
         )
 
@@ -554,7 +542,7 @@ def applyTo(self, config):
         flag = self._getFlag(config)
         # Use -Werror to make sure we see an error about the flag being unsupported.
         if hasCompileFlag(config, "-Werror " + flag):
-            config.substitutions = _appendToSubstitution(
+            config.substitutions = lit.formats.standardlibrarytest._appendToSubstitution(
                 config.substitutions, "%{compile_flags}", flag
             )