Update tests and variable uses for new names, format

Author: SLTozer

llvm/test/tools/llvm-original-di-preservation/error-test.test renamed to llvm/test/tools/llvm-original-di-preservation/acceptance-test.test

@@ -1,4 +1,4 @@
-RUN: not %llvm-original-di-preservation %p/Inputs/sample.json --error-test | FileCheck %s
+RUN: not %llvm-original-di-preservation %p/Inputs/sample.json --acceptance-test | FileCheck %s
 CHECK:      DILocation Bugs:
 CHECK-NEXT:   test.ll:
 CHECK-NEXT:     no-name:
@@ -20,7 +20,7 @@ CHECK-NEXT:       fn_name: fn1
 CHECK-NEXT:       instr: extractvalue
 CHECK:      Errors detected for:
 
-RUN: not %llvm-original-di-preservation %p/Inputs/sample.json --error-test --compress | FileCheck %s --check-prefix=COMPRESS
+RUN: not %llvm-original-di-preservation %p/Inputs/sample.json --acceptance-test --reduce | FileCheck %s --check-prefix=COMPRESS
 COMPRESS:      DILocation Bugs:
 COMPRESS-NEXT:   test.ll:
 COMPRESS-NEXT:     no-name:
@@ -34,7 +34,7 @@ COMPRESS-NEXT:       fn_name: fn
 COMPRESS-NEXT:       instr: insertvalue
 COMPRESS:      Errors detected for:
 
-RUN: not %llvm-original-di-preservation %p/Inputs/origin.json --error-test --compress | FileCheck %s --check-prefix=ORIGIN
+RUN: not %llvm-original-di-preservation %p/Inputs/origin.json --acceptance-test --reduce | FileCheck %s --check-prefix=ORIGIN
 ORIGIN:      DILocation Bugs:
 ORIGIN-NEXT:   test.ll:
 ORIGIN-NEXT:     LoopVectorizePass:
@@ -66,5 +66,5 @@ ORIGIN-NEXT:         #18 0x00005895cfae1224 llvm::DevirtSCCRepeatedPass::run(llv
 ORIGIN-NEXT:         #19 0x00005895d1e5067d llvm::detail::PassModel, llvm::LazyCallGraph&, llvm::CGSCCUpdateResult&>::run(llvm::LazyCallGraph::SCC&, llvm::AnalysisManager&, llvm::LazyCallGraph&, llvm::CGSCCUpdateResult&) /tmp/llvm-project/llvm/include/llvm/IR/PassManagerInternal.h:91:5
 ORIGIN:      Errors detected for:
 
-RUN: %llvm-original-di-preservation %p/Inputs/non-existent.json --error-test | FileCheck %s --check-prefix=EMPTY
+RUN: %llvm-original-di-preservation %p/Inputs/non-existent.json --acceptance-test | FileCheck %s --check-prefix=EMPTY
 EMPTY: No errors detected for:

llvm/test/tools/llvm-original-di-preservation/basic.test

@@ -1,17 +1,17 @@
-RUN: %llvm-original-di-preservation %p/Inputs/sample.json --report-file %t.html | FileCheck %s
+RUN: %llvm-original-di-preservation %p/Inputs/sample.json --report-html-file %t.html | FileCheck %s
 RUN: diff -w %p/Inputs/expected-sample.html %t.html
 CHECK: The {{.+}}.html generated.
 CHECK-NOT: Skipped lines:
 
-RUN: %llvm-original-di-preservation %p/Inputs/corrupted.json --report-file %t2.html | FileCheck %s -check-prefix=CORRUPTED
+RUN: %llvm-original-di-preservation %p/Inputs/corrupted.json --report-html-file %t2.html | FileCheck %s -check-prefix=CORRUPTED
 RUN: diff -w %p/Inputs/expected-skipped.html %t2.html
 CORRUPTED: Skipped lines: 3
 CORRUPTED: Skipped bugs: 1
 
-RUN: %llvm-original-di-preservation --compress %p/Inputs/sample.json --report-file %t3.html | FileCheck %s -check-prefix=COMPRESSED
+RUN: %llvm-original-di-preservation --reduce %p/Inputs/sample.json --report-html-file %t3.html | FileCheck %s -check-prefix=REDUCE
 RUN: diff -w %p/Inputs/expected-compressed.html %t3.html
-COMPRESSED: The {{.+}}.html generated.
-COMPRESSED-NOT: Skipped lines:
+REDUCE: The {{.+}}.html generated.
+REDUCE-NOT: Skipped lines:
 
-RUN: %llvm-original-di-preservation %p/Inputs/origin.json --report-file %t4.html | FileCheck %s
+RUN: %llvm-original-di-preservation %p/Inputs/origin.json --report-html-file %t4.html | FileCheck %s
 RUN: diff -w %p/Inputs/expected-origin.html %t4.html

llvm/utils/llvm-original-di-preservation.py

@@ -497,11 +497,13 @@ def Main():
     parser = argparse.ArgumentParser()
     opts = parse_program_args(parser)
 
-    if opts.report_html_file is not None and not opts.report_html_file.endswith(".html"):
+    if opts.report_html_file is not None and not opts.report_html_file.endswith(
+        ".html"
+    ):
         print("error: The output file must be '.html'.")
         sys.exit(1)
 
-    if opts.error_test:
+    if opts.acceptance_test:
         if os.path.isdir(opts.file_name):
             print(f"error: Directory passed as input file: '{opts.file_name}'")
             sys.exit(1)
@@ -582,7 +584,7 @@ def Main():
                     di_loc_bug = DILocBug(origin, action, bb_name, fn_name, instr)
                     if not di_loc_bug.key() in di_loc_set:
                         di_loc_set.add(di_loc_bug.key())
-                        if opts.compress:
+                        if opts.reduce:
                             pass_instr = bugs_pass + instr
                             if not pass_instr in di_loc_pass_instr_set:
                                 di_loc_pass_instr_set.add(pass_instr)
@@ -605,7 +607,7 @@ def Main():
                     di_sp_bug = DISPBug(action, name)
                     if not di_sp_bug.key() in di_sp_set:
                         di_sp_set.add(di_sp_bug.key())
-                        if opts.compress:
+                        if opts.reduce:
                             pass_fn = bugs_pass + name
                             if not pass_fn in di_sp_pass_fn_set:
                                 di_sp_pass_fn_set.add(pass_fn)
@@ -629,7 +631,7 @@ def Main():
                     di_var_bug = DIVarBug(action, name, fn_name)
                     if not di_var_bug.key() in di_var_set:
                         di_var_set.add(di_var_bug.key())
-                        if opts.compress:
+                        if opts.reduce:
                             pass_var = bugs_pass + name
                             if not pass_var in di_var_pass_var_set:
                                 di_var_pass_var_set.add(pass_var)
@@ -673,7 +675,7 @@ def Main():
         if di_variable_bugs:
             print_bugs_yaml("DIVariable Bugs", di_variable_bugs)
 
-    if opts.error_test:
+    if opts.acceptance_test:
         if any((di_location_bugs, di_subprogram_bugs, di_variable_bugs)):
             # Add a newline gap after printing at least one error.
             print()