From: Simon Pilgrim Date: Tue, 5 Mar 2019 10:44:37 +0000 (+0000) Subject: Add wildcard support to all update_*_test_checks.py scripts (PR37500) X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf02f1a2ebbfb4160f83836f574197c95db96b34;p=llvm Add wildcard support to all update_*_test_checks.py scripts (PR37500) We can already update multiple files in each update call, this extends it to work with wildcards as well in the same way as update_mca_test_checks.py (to support shells that won't do this for us - windows command prompt etc.) Differential Revision: https://reviews.llvm.org/D58817 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@355386 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/utils/update_analyze_test_checks.py b/utils/update_analyze_test_checks.py index 4d1d912aba8..df09108937c 100755 --- a/utils/update_analyze_test_checks.py +++ b/utils/update_analyze_test_checks.py @@ -32,6 +32,7 @@ designed to be authoratitive about what constitutes a good test! from __future__ import print_function import argparse +import glob import itertools import os # Used to advertise this file's name ("autogenerated_note"). import string @@ -48,10 +49,6 @@ ADVERT = '; NOTE: Assertions have been autogenerated by ' IR_FUNCTION_RE = re.compile('^\s*define\s+(?:internal\s+)?[^@]*@([\w-]+)\s*\(') - - - - def main(): from argparse import RawTextHelpFormatter parser = argparse.ArgumentParser(description=__doc__, formatter_class=RawTextHelpFormatter) @@ -71,7 +68,8 @@ def main(): print('ERROR: Unexpected opt name: ' + opt_basename, file=sys.stderr) sys.exit(1) - for test in args.tests: + test_paths = [test for pattern in args.tests for test in glob.glob(pattern)] + for test in test_paths: if args.verbose: print('Scanning for RUN lines in test file: %s' % (test,), file=sys.stderr) with open(test) as f: diff --git a/utils/update_llc_test_checks.py b/utils/update_llc_test_checks.py index 5d2aac2509e..9dd25d386b1 100755 --- a/utils/update_llc_test_checks.py +++ b/utils/update_llc_test_checks.py @@ -10,6 +10,7 @@ a single test function. from __future__ import print_function import argparse +import glob import os # Used to advertise this file's name ("autogenerated_note"). import string import subprocess @@ -42,7 +43,8 @@ def main(): autogenerated_note = (ADVERT + 'utils/' + os.path.basename(__file__)) - for test in args.tests: + test_paths = [test for pattern in args.tests for test in glob.glob(pattern)] + for test in test_paths: if args.verbose: print('Scanning for RUN lines in test file: %s' % (test,), file=sys.stderr) with open(test) as f: diff --git a/utils/update_mir_test_checks.py b/utils/update_mir_test_checks.py index cf7528f5760..b42a38bd55a 100755 --- a/utils/update_mir_test_checks.py +++ b/utils/update_mir_test_checks.py @@ -21,6 +21,7 @@ from __future__ import print_function import argparse import collections +import glob import os import re import subprocess @@ -426,7 +427,8 @@ def main(): parser.add_argument('tests', nargs='+') args = parser.parse_args() - for test in args.tests: + test_paths = [test for pattern in args.tests for test in glob.glob(pattern)] + for test in test_paths: try: update_test_file(args.llc, test, args.remove_common_prefixes, verbose=args.verbose) diff --git a/utils/update_test_checks.py b/utils/update_test_checks.py index b63a9174208..f108e8c74b1 100755 --- a/utils/update_test_checks.py +++ b/utils/update_test_checks.py @@ -32,6 +32,7 @@ designed to be authoratitive about what constitutes a good test! from __future__ import print_function import argparse +import glob import itertools import os # Used to advertise this file's name ("autogenerated_note"). import string @@ -71,7 +72,8 @@ def main(): print('ERROR: Unexpected opt name: ' + opt_basename, file=sys.stderr) sys.exit(1) - for test in args.tests: + test_paths = [test for pattern in args.tests for test in glob.glob(pattern)] + for test in test_paths: if args.verbose: print('Scanning for RUN lines in test file: %s' % (test,), file=sys.stderr) with open(test) as f: