Convert the rest of the tests managed by the "test updating programs" to

3c-regtest.

Made needed enhancements to the 3c-regtest tools:

- Add support for the rest of the RUN scripts.

- Add support for RUN scripts with blank lines in the middle, as used by
  the common-testgenerator script.

A few tests are failing verification, i.e., their existing RUN scripts
didn't match the ones generated by the test updating programs.  To
investigate.

Author: mattmccutchen-cci

clang/test/3C/3c-regtest-unconvert.py

@@ -30,18 +30,25 @@
 with open(argobj.test_file) as f:
     lines = f.readlines()
 
-m = re.search(r"\A// RUN: %S/3c-regtest\.py (.*) %s -t %t --clang '%clang'\n\Z", lines[0])
-if m is None:
-    sys.exit('The first line of %s is not a canonical 3c-regtest.py RUN line.' % argobj.test_file)
-test_type_flags_joined = m.group(1)
-
-# FUTURE: Will we need to handle quoting?
-test_type_flags = test_type_flags_joined.split(' ')
-# XXX: This just exits on error. We'd like to add a more meaningful message, but
-# the default Python version on gamera (2.7.18) is too old to support
-# exit_on_error=False.
-test_type_argobj = script_generator.parser.parse_args(test_type_flags + [argobj.test_file])
-
-run_lines = ['// RUN: %s\n' % cmd for cmd in script_generator.generate_commands(test_type_argobj)]
-new_lines = run_lines + lines[1:]
+new_lines = []
+for l in lines:
+    if '3c-regtest' in l:
+        m = re.search(r"\A// RUN: %S/3c-regtest\.py (.*) %s -t %t --clang '%clang'\n\Z", l)
+        if m is None:
+            sys.exit('Non-canonical 3c-regtest RUN line: %s' % l)  # XXX Trailing newline
+        test_type_flags_joined = m.group(1)
+
+        # FUTURE: Will we need to handle quoting?
+        test_type_flags = test_type_flags_joined.split(' ')
+        # XXX: This just exits on error. We'd like to add a more meaningful message, but
+        # the default Python version on gamera (2.7.18) is too old to support
+        # exit_on_error=False.
+        test_type_argobj = script_generator.parser.parse_args(test_type_flags + [argobj.test_file])
+
+        run_lines = [('// RUN: %s\n' % cmd if cmd != '' else '\n')
+                     for cmd in script_generator.generate_commands(test_type_argobj)]
+        new_lines.extend(run_lines)
+    else:
+        new_lines.append(l)
+
 sys.stdout.write(''.join(new_lines))

clang/test/3C/3c-regtest-verify-all-conversions.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# Usage: ./3c-regtest-verify-all-conversions.sh BASE_TREEISH
+#
+# BASE_TREEISH has the original versions of the tests to compare to. Typically,
+# it would be origin/test-command-refactoring.verify-base .
+#
+# This takes a little while, so you may want to redirect the output to a file
+# and view it later
+
+set -e
+set -o pipefail
+base_commit="$1"
+git rev-parse "$base_commit^{tree}" &>/dev/null || { echo >&2 'Invalid base tree'; exit 1; }
+
+for f in $(git grep --files-with-matches '3c-regtest' *.c); do
+	./3c-regtest-unconvert.py $f | {
+		diff --label $f.orig --label $f.unconvert -u <(git show "$base_commit":./$f) - || [ $? == 1 ]
+	}
+done

clang/test/3C/3c-regtest.py

@@ -66,7 +66,7 @@
     ('#_MARKER_#', '%')
 ]
 
-commands = script_generator.generate_commands(argobj)
+commands = [cmd for cmd in script_generator.generate_commands(argobj) if cmd != '']
 commands = lit.TestRunner.applySubstitutions(commands, substitutions)
 
 class FakeTestConfig:

clang/test/3C/3d-allocation.c

@@ -1,9 +1,4 @@
-// RUN: 3c -alltypes -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" %s
-// RUN: 3c -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" %s
-// RUN: 3c -addcr %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
-// RUN: 3c -output-postfix=checked -alltypes %s
-// RUN: 3c -alltypes %S/3d-allocation.checked.c -- | count 0
-// RUN: rm %S/3d-allocation.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 #include <stdio.h>
 #include <stdlib.h>

clang/test/3C/alloc_type_param.c

@@ -1,9 +1,4 @@
-// RUN: 3c -alltypes -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" %s
-// RUN: 3c -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" %s
-// RUN: 3c -addcr %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
-// RUN: 3c -output-postfix=checked -alltypes %s
-// RUN: 3c -alltypes %S/alloc_type_param.checked.c -- | count 0
-// RUN: rm %S/alloc_type_param.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 #include <stddef.h>
 extern _Itype_for_any(T) void *calloc(size_t nmemb, size_t size) : itype(_Array_ptr<T>) byte_count(nmemb * size);

clang/test/3C/amper.c

@@ -1,9 +1,4 @@
-// RUN: 3c -alltypes -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" %s
-// RUN: 3c -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" %s
-// RUN: 3c -addcr %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
-// RUN: 3c -output-postfix=checked -alltypes %s
-// RUN: 3c -alltypes %S/amper.checked.c -- | count 0
-// RUN: rm %S/amper.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 void foo(int *x) {
 	//CHECK: void foo(int *x : itype(_Ptr<int>)) {

clang/test/3C/arrboth.c

@@ -1,10 +1,4 @@
-// RUN: 3c -alltypes -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" %s
-// RUN: 3c -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" %s
-// RUN: 3c -addcr %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
-
-// RUN: 3c -alltypes -output-postfix=checked %s
-// RUN: 3c -alltypes %S/arrboth.checked.c -- | count 0
-// RUN: rm %S/arrboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/

clang/test/3C/arrbothmulti1.c

@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrbothmulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrbothmulti2.c
-// RUN: %clang -c %S/arrbothmulti1.checkedNOALL.c %S/arrbothmulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrbothmulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrbothmulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrbothmulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrbothmulti1.checked.c %S/arrbothmulti2.checked.c
-// RUN: test ! -f %S/arrbothmulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrbothmulti2.checked.convert_again.c
-// RUN: rm %S/arrbothmulti1.checkedALL.c %S/arrbothmulti2.checkedALL.c
-// RUN: rm %S/arrbothmulti1.checkedNOALL.c %S/arrbothmulti2.checkedNOALL.c
-// RUN: rm %S/arrbothmulti1.checked.c %S/arrbothmulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/

clang/test/3C/arrbothmulti2.c

@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrbothmulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrbothmulti1.c %s
-// RUN: %clang -c %S/arrbothmulti1.checkedNOALL2.c %S/arrbothmulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrbothmulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrbothmulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrbothmulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrbothmulti1.checked2.c %S/arrbothmulti2.checked2.c
-// RUN: test ! -f %S/arrbothmulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrbothmulti2.checked2.convert_again.c
-// RUN: rm %S/arrbothmulti1.checkedALL2.c %S/arrbothmulti2.checkedALL2.c
-// RUN: rm %S/arrbothmulti1.checkedNOALL2.c %S/arrbothmulti2.checkedNOALL2.c
-// RUN: rm %S/arrbothmulti1.checked2.c %S/arrbothmulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/

clang/test/3C/arrcallee.c

@@ -1,10 +1,4 @@
-// RUN: 3c -alltypes -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" %s
-// RUN: 3c -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" %s
-// RUN: 3c -addcr %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
-
-// RUN: 3c -alltypes -output-postfix=checked %s
-// RUN: 3c -alltypes %S/arrcallee.checked.c -- | count 0
-// RUN: rm %S/arrcallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/