From 58e646c0e882a98fe71bc8ed469d43ad081b0f32 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Mon, 23 Jan 2023 10:38:53 +0100 Subject: [PATCH] update_test_checks.py: pick up --tool from UTC_ARGS It's not clear to me how to write a test for this. The tests run in an environment where the tools may not be in PATH, and so the existing custom-tool.test needs to use --tool-binary when invoking update_test_checks.py. But it can't do so without also using --tool. This change does fix a problem though with using update_any_test_checks.py in an environment where the tools *are* available in PATH. Differential Revision: https://reviews.llvm.org/D142450 --- llvm/utils/update_test_checks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/llvm/utils/update_test_checks.py b/llvm/utils/update_test_checks.py index e43efa3..c3d8ef8 100755 --- a/llvm/utils/update_test_checks.py +++ b/llvm/utils/update_test_checks.py @@ -71,7 +71,6 @@ def main(): if not re.match(r'^%s(-\d+)?(\.exe)?$' % (initial_args.tool), tool_basename): common.error('Unexpected tool name: ' + tool_basename) sys.exit(1) - tool_basename = initial_args.tool for ti in common.itertests(initial_args.tests, parser, script_name='utils/' + script_name): @@ -81,6 +80,8 @@ def main(): else: common.SCRUB_TRAILING_WHITESPACE_TEST_RE = common.SCRUB_TRAILING_WHITESPACE_RE + tool_basename = ti.args.tool + prefix_list = [] for l in ti.run_lines: if '|' not in l: -- 2.7.4