From 5d838808854b9b6a7cb357d7768d37fc94fa7d73 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne@apple.com>
Date: Fri, 26 Jun 2020 00:55:29 -0400
Subject: [PATCH] [runtimes] Remove the ability to select the old libc++
 testing format

As announced on libcxx-dev at [1], the old libc++ testing format is being
removed in favour of the new one. Follow-up commits will clean up the
code that is dead after the removal of this option.

[1]: http://lists.llvm.org/pipermail/libcxx-dev/2020-June/000885.html
---
 libcxx/test/lit.site.cfg.in        | 10 +++-------
 libcxx/utils/libcxx/test/config.py | 21 +++------------------
 libcxxabi/test/lit.site.cfg.in     | 10 +++-------
 libunwind/test/lit.site.cfg.in     | 10 +++-------
 4 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/libcxx/test/lit.site.cfg.in b/libcxx/test/lit.site.cfg.in
index 8692217..4d3c493 100644
--- a/libcxx/test/lit.site.cfg.in
+++ b/libcxx/test/lit.site.cfg.in
@@ -60,15 +60,11 @@ config.recursiveExpansionLimit = 10
 # Infer the test_exec_root from the libcxx_object root.
 config.test_exec_root = os.path.join(config.libcxx_obj_root, 'test')
 
+import libcxx.test.newformat
+config.test_format = libcxx.test.newformat.CxxStandardLibraryTest()
+
 lit_config.note('Using configuration variant: {}'.format(config.configuration_variant))
 import libcxx.test.config
 configuration = libcxx.test.config.Configuration(lit_config, config)
 configuration.configure()
 configuration.print_config_info()
-if lit_config.params.get('use_old_format', False):
-    lit_config.note("Using the old libc++ testing format")
-    config.test_format = configuration.get_test_format()
-else:
-    lit_config.note("Using the new libc++ testing format")
-    import libcxx.test.newformat
-    config.test_format = libcxx.test.newformat.CxxStandardLibraryTest()
diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py
index 41c0b08..27b59e5 100644
--- a/libcxx/utils/libcxx/test/config.py
+++ b/libcxx/utils/libcxx/test/config.py
@@ -189,22 +189,8 @@ class Configuration(object):
             exec_env=self.exec_env)
 
     def configure_executor(self):
-        if self.get_lit_conf('use_old_format'):
-            exec_str = self.get_lit_conf('executor', "None")
-            te = eval(exec_str)
-            if te:
-                self.lit_config.note("Using executor: %r" % exec_str)
-                if self.lit_config.useValgrind:
-                    self.lit_config.fatal("The libc++ test suite can't run under Valgrind with a custom executor")
-            else:
-                te = LocalExecutor()
-
-            te.target_info = self.target_info
-            self.target_info.executor = te
-            self.executor = te
-        else:
-            self.executor = self.get_lit_conf('executor')
-            self.lit_config.note("Using executor: {}".format(self.executor))
+        self.executor = self.get_lit_conf('executor')
+        self.lit_config.note("Using executor: {}".format(self.executor))
 
     def configure_target_info(self):
         self.target_info = make_target_info(self)
@@ -751,8 +737,7 @@ class Configuration(object):
             '--codesign_identity "{}"'.format(codesign_ident),
             '--env {}'.format(env_vars)
         ]
-        if not self.get_lit_conf('use_old_format'):
-            sub.append(('%{exec}', '{} {} -- '.format(self.executor, ' '.join(exec_args))))
+        sub.append(('%{exec}', '{} {} -- '.format(self.executor, ' '.join(exec_args))))
         if self.get_lit_conf('libcxx_gdb'):
             sub.append(('%{libcxx_gdb}', self.get_lit_conf('libcxx_gdb')))
 
diff --git a/libcxxabi/test/lit.site.cfg.in b/libcxxabi/test/lit.site.cfg.in
index 4c8d420..3d1c546 100644
--- a/libcxxabi/test/lit.site.cfg.in
+++ b/libcxxabi/test/lit.site.cfg.in
@@ -54,15 +54,11 @@ config.recursiveExpansionLimit = 10
 # Infer the test_exec_root from the build directory.
 config.test_exec_root = os.path.join(config.libcxxabi_obj_root, 'test')
 
+import libcxx.test.newformat
+config.test_format = libcxx.test.newformat.CxxStandardLibraryTest()
+
 lit_config.note('Using configuration variant: libcxxabi')
 import libcxxabi.test.config
 configuration = libcxxabi.test.config.Configuration(lit_config, config)
 configuration.configure()
 configuration.print_config_info()
-if lit_config.params.get('use_old_format', False):
-    lit_config.note("Using the old libc++ testing format")
-    config.test_format = configuration.get_test_format()
-else:
-    lit_config.note("Using the new libc++ testing format")
-    import libcxx.test.newformat
-    config.test_format = libcxx.test.newformat.CxxStandardLibraryTest()
diff --git a/libunwind/test/lit.site.cfg.in b/libunwind/test/lit.site.cfg.in
index e37fe2f..64d945d 100644
--- a/libunwind/test/lit.site.cfg.in
+++ b/libunwind/test/lit.site.cfg.in
@@ -48,15 +48,11 @@ config.recursiveExpansionLimit = 10
 # Infer the test_exec_root from the build directory.
 config.test_exec_root = os.path.join(config.libunwind_obj_root, 'test')
 
+import libcxx.test.newformat
+config.test_format = libcxx.test.newformat.CxxStandardLibraryTest()
+
 lit_config.note('Using configuration variant: libunwind')
 import libunwind.test.config
 configuration = libunwind.test.config.Configuration(lit_config, config)
 configuration.configure()
 configuration.print_config_info()
-if lit_config.params.get('use_old_format', False):
-    lit_config.note("Using the old libc++ testing format")
-    config.test_format = configuration.get_test_format()
-else:
-    lit_config.note("Using the new libc++ testing format")
-    import libcxx.test.newformat
-    config.test_format = libcxx.test.newformat.CxxStandardLibraryTest()
-- 
2.7.4