# 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()
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)
'--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')))
# 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()
# 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()