[llvm] 2e6c508 - [Utils] Refactor update_cc_test_checks.py to use shutil
Nuno Lopes via llvm-commits
llvm-commits at lists.llvm.org
Tue Sep 20 01:42:15 PDT 2022
Author: John McIver
Date: 2022-09-20T09:42:06+01:00
New Revision: 2e6c50855b7d879ded3776ba87b3d960e2035b89
URL: https://github.com/llvm/llvm-project/commit/2e6c50855b7d879ded3776ba87b3d960e2035b89
DIFF: https://github.com/llvm/llvm-project/commit/2e6c50855b7d879ded3776ba87b3d960e2035b89.diff
LOG: [Utils] Refactor update_cc_test_checks.py to use shutil
The package distutils is deprecated and removal is planned for Python 3.12.
All calls to distutils.spawn.find_executable are replaced with shutil.which.
Differential Revision: https://reviews.llvm.org/D134015
Added:
Modified:
llvm/utils/update_cc_test_checks.py
Removed:
################################################################################
diff --git a/llvm/utils/update_cc_test_checks.py b/llvm/utils/update_cc_test_checks.py
index b9e91f19461b..967651d622df 100755
--- a/llvm/utils/update_cc_test_checks.py
+++ b/llvm/utils/update_cc_test_checks.py
@@ -16,11 +16,11 @@
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 distutils.spawn.find_executable(args.clang):
+ if not shutil.which(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 distutils.spawn.find_executable(args.opt):
+ if not shutil.which(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.
More information about the llvm-commits
mailing list