From 837caa99a273c76541a376768e1ba0f7a094fde0 Mon Sep 17 00:00:00 2001 From: Ben Dunbobbin Date: Tue, 20 Sep 2022 16:50:18 +0100 Subject: [PATCH] Revert "[Utils] Refactor update_cc_test_checks.py to use shutil" This reverts commit 2e6c50855b7d879ded3776ba87b3d960e2035b89. This caused failures on windows bots: - https://lab.llvm.org/buildbot/#/builders/216/builds/10030 - https://ci.chromium.org/ui/p/fuchsia/builders/toolchain.ci/clang-windows-x64/b8802513693562827489/overview --- llvm/utils/update_cc_test_checks.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/utils/update_cc_test_checks.py b/llvm/utils/update_cc_test_checks.py index 967651d..b9e91f1 100755 --- a/llvm/utils/update_cc_test_checks.py +++ b/llvm/utils/update_cc_test_checks.py @@ -16,11 +16,11 @@ from __future__ import print_function import argparse import collections +import distutils.spawn import json import os import re import shlex -import shutil import subprocess import sys import tempfile @@ -167,7 +167,7 @@ def config(): args = common.parse_commandline_args(parser) infer_dependent_args(args) - if not shutil.which(args.clang): + if not distutils.spawn.find_executable(args.clang): print('Please specify --llvm-bin or --clang', file=sys.stderr) sys.exit(1) @@ -183,7 +183,7 @@ def config(): common.warn('Could not determine clang builtins directory, some tests ' 'might not update correctly.') - if not shutil.which(args.opt): + if not distutils.spawn.find_executable(args.opt): # Many uses of this tool will not need an opt binary, because it's only # needed for updating a test that runs clang | opt | FileCheck. So we # defer this error message until we find that opt is actually needed. -- 2.7.4