From 48976e56844c9046c6f6c1c39d88d1c996714f68 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 3 Jun 2019 11:18:48 -0700 Subject: [PATCH] test: add a workaround for `rth` invocation The `rth` tool is a python script and relied on the execution via the shebang. However, not all targets support the shebang to invoke the interpreter. Explicitly launch the resilience test helper with the interpreter (python). Ideally, we would use the `%rth` substitution, but that does not seem to function for the nested case here. --- test/lit.cfg | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/lit.cfg b/test/lit.cfg index 7dbb90dfde51b..2f899e146eef9 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -1338,12 +1338,13 @@ rth_flags = '' if swift_execution_tests_extra_flags: rth_flags = swift_execution_tests_extra_flags + ' -wmo' +# FIXME: why can we not use %rth and have that be expanded out? config.target_resilience_test = ( - '%s --target-build-swift "%s" --target-run "%s" --t %%t --S %%S --s %%s ' - '--lib-prefix "%s" --lib-suffix "%s" --target-codesign "%s" ' + '%r %s --target-build-swift "%s" --target-run "%s" --t %%t --S %%S ' + '--s %%s --lib-prefix "%s" --lib-suffix "%s" --target-codesign "%s" ' '--additional-compile-flags "%s" --triple "%s"' - % (config.rth, config.target_build_swift, config.target_run, - config.target_shared_library_prefix, + % (sys.executable, config.rth, config.target_build_swift, + config.target_run, config.target_shared_library_prefix, config.target_shared_library_suffix, config.target_codesign, rth_flags, config.variant_triple))