[PATCH] D142450: update_test_checks.py: pick up --tool from UTC_ARGS

[Nicolai Hähnle via Phabricator via llvm-commits]

nhaehnle created this revision.
nhaehnle added reviewers: mtrofin, nikic, lebedev.ri, arichardson, jsilvanus.
Herald added a subscriber: StephenFan.
Herald added a project: All.
nhaehnle requested review of this revision.
Herald added a project: LLVM.

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.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D142450

Files:
  llvm/utils/update_test_checks.py


Index: llvm/utils/update_test_checks.py
===================================================================
--- llvm/utils/update_test_checks.py
+++ llvm/utils/update_test_checks.py
@@ -71,7 +71,6 @@
     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 @@
     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:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D142450.491701.patch
Type: text/x-patch
Size: 755 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230124/c90696df/attachment.bin>