[Utils] Use common substs in update_cc_test_checks

[sebastian-ne]

Summary

Use substitution methods from common.py in update_cc_test_checks.py.

Follow up to D110143.

[arichardson]

llvm/utils/update_cc_test_checks.py

223

I think common.applySubstitutions should be called here and not below.

242

Shouldn't %t be supported in all tools? We could move this common.py. However, before doing that we should also fix temporary files to be cleaned up on exit. Looks like that bug was introduced in D98712.

I think the easiest solution would be to use a filename inside a TemporaryDirectory() that is cleaned up on exit.

clang/test/utils/update_cc_test_checks/Inputs/exec-all-runlines.c

 // Check that the non-clang/non-filechecked runlines execute
-// RUN: cp %s %S/Output/execute-all-runlines.copy.c
-// RUN: cp %S/Output/execute-all-runlines.copy.c %s.copy.c
+// RUN: cp %s %S/execute-all-runlines.copy.c
+// RUN: cp %S/execute-all-runlines.copy.c %s.copy.c
 // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fopenmp %s.copy.c -emit-llvm-bc -o %t-host.bc
 // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fopenmp -fopenmp-host-ir-file-path %t-host.bc %s.copy.c -emit-llvm -o - | FileCheck %s --check-prefix=CHECK1
 // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-pch %s -o %t
 // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -include-pch %t %s.copy.c -emit-llvm -o - | FileCheck %s --check-prefix=CHECK2
 // RUN: %clang_cc1 -triple powerpc64le-unknown-linux-gnu -emit-pch %s -o %t
 // RUN: %clang_cc1 -triple powerpc64le-unknown-linux-gnu -include-pch %t %s.copy.c -emit-llvm -o - | FileCheck %s --check-prefix=CHECK3
 
 

clang/test/utils/update_cc_test_checks/Inputs/exec-all-runlines.c.expected

 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
 // Check that the non-clang/non-filechecked runlines execute
-// RUN: cp %s %S/Output/execute-all-runlines.copy.c
-// RUN: cp %S/Output/execute-all-runlines.copy.c %s.copy.c
+// RUN: cp %s %S/execute-all-runlines.copy.c
+// RUN: cp %S/execute-all-runlines.copy.c %s.copy.c
 // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fopenmp %s.copy.c -emit-llvm-bc -o %t-host.bc
 // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fopenmp -fopenmp-host-ir-file-path %t-host.bc %s.copy.c -emit-llvm -o - | FileCheck %s --check-prefix=CHECK1
 // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-pch %s -o %t
 // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -include-pch %t %s.copy.c -emit-llvm -o - | FileCheck %s --check-prefix=CHECK2
 // RUN: %clang_cc1 -triple powerpc64le-unknown-linux-gnu -emit-pch %s -o %t
 // RUN: %clang_cc1 -triple powerpc64le-unknown-linux-gnu -include-pch %t %s.copy.c -emit-llvm -o - | FileCheck %s --check-prefix=CHECK3
 
 

llvm/utils/update_cc_test_checks.py

builder.process_run_line(
             common.OPT_FUNCTION_RE, common.scrub_body, raw_tool_output,
             prefixes, False)
   else:
     print('The clang command line should include -emit-llvm as asm tests '
           'are discouraged in Clang testsuite.', file=sys.stderr)
     sys.exit(1)
 
 def exec_run_line(exe):
   popen = subprocess.Popen(exe, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
   stdout, stderr = popen.communicate()
   if popen.returncode != 0:
     sys.stderr.write('Failed to run ' + ' '.join(exe) + '\n')
     sys.stderr.write(stderr)
     sys.stderr.write(stdout)
     sys.exit(3)
 
 def main():
   initial_args, parser = config()
   script_name = os.path.basename(__file__)
 
   for ti in common.itertests(initial_args.tests, parser, 'utils/' + script_name,
                              comment_prefix='//', argparse_callback=infer_dependent_args):
     # Build a list of filechecked and non-filechecked RUN lines.
     run_list = []
     line2func_list = collections.defaultdict(list)
 
-    subs = {
-      '%s' : ti.path,
-      '%t' : tempfile.NamedTemporaryFile().name,
-      '%S' : os.getcwd(),
-    }
+    subs = common.getSubstitutions(ti.path)
+    subs.append(('%t', tempfile.NamedTemporaryFile().name))
 
     for l in ti.run_lines:
       commands = [cmd.strip() for cmd in l.split('|')]
 
       triple_in_cmd = None
       m = common.TRIPLE_ARG_RE.search(commands[0])
       if m:
         triple_in_cmd = m.groups()[0]
 
       # Parse executable args.
       exec_args = shlex.split(commands[0])
       # Execute non-clang runline.
       if exec_args[0] not in SUBST:
         # Do lit-like substitutions.
-        for s in subs:
-          exec_args = [i.replace(s, subs[s]) if s in i else i for i in exec_args]
+        exec_args = [common.applySubstitutions(a, subs) for a in exec_args]
         run_list.append((None, exec_args, None, None))
         continue
       # This is a clang runline, apply %clang substitution rule, do lit-like substitutions,
       # and append args.clang_args
       clang_args = exec_args
       clang_args[0:1] = SUBST[clang_args[0]]
-      for s in subs:
-        clang_args = [i.replace(s, subs[s]) if s in i else i for i in clang_args]
+      clang_args = [common.applySubstitutions(a, subs) for a in clang_args]
       clang_args += ti.args.clang_args
 
       # Extract -check-prefix in FileCheck args
       filecheck_cmd = commands[-1]
       common.verify_filecheck_prefixes(filecheck_cmd)
       if not filecheck_cmd.startswith('FileCheck '):
         # Execute non-filechecked clang runline.
         exe = [ti.args.clang] + clang_args