diff --git a/clang/test/3C/3c-regtest-unconvert.py b/clang/test/3C/3c-regtest-unconvert.py
index 306426a6fecf..5a014535e0fa 100755
--- a/clang/test/3C/3c-regtest-unconvert.py
+++ b/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))
diff --git a/clang/test/3C/3c-regtest-verify-all-conversions.sh b/clang/test/3C/3c-regtest-verify-all-conversions.sh
new file mode 100755
index 000000000000..85502d7dfffa
--- /dev/null
+++ b/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
diff --git a/clang/test/3C/3c-regtest.py b/clang/test/3C/3c-regtest.py
index e0ca7120a5ad..89e187ee4d9c 100755
--- a/clang/test/3C/3c-regtest.py
+++ b/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:
diff --git a/clang/test/3C/3d-allocation.c b/clang/test/3C/3d-allocation.c
index 050fc5f2b1bf..f4e52c7e3464 100644
--- a/clang/test/3C/3d-allocation.c
+++ b/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>
diff --git a/clang/test/3C/alloc_type_param.c b/clang/test/3C/alloc_type_param.c
index f73d140f705d..51ff1fc2d107 100644
--- a/clang/test/3C/alloc_type_param.c
+++ b/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);
diff --git a/clang/test/3C/amper.c b/clang/test/3C/amper.c
index a6b474f02ee9..976b7afbb663 100644
--- a/clang/test/3C/amper.c
+++ b/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) {
diff --git a/clang/test/3C/arrboth.c b/clang/test/3C/arrboth.c
index f61b7c07ee68..a5252a8cdbe0 100644
--- a/clang/test/3C/arrboth.c
+++ b/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'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrbothmulti1.c b/clang/test/3C/arrbothmulti1.c
index a0c42aeee929..66a8a60b5c26 100644
--- a/clang/test/3C/arrbothmulti1.c
+++ b/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'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrbothmulti2.c b/clang/test/3C/arrbothmulti2.c
index b2760bcb173b..7f89d5626093 100644
--- a/clang/test/3C/arrbothmulti2.c
+++ b/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'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrcallee.c b/clang/test/3C/arrcallee.c
index 0e2a203cc0ad..d238320126bc 100644
--- a/clang/test/3C/arrcallee.c
+++ b/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'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrcalleemulti1.c b/clang/test/3C/arrcalleemulti1.c
index 8797c61fd06a..ecec6ab9b2bb 100644
--- a/clang/test/3C/arrcalleemulti1.c
+++ b/clang/test/3C/arrcalleemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrcalleemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrcalleemulti2.c
-// RUN: %clang -c %S/arrcalleemulti1.checkedNOALL.c %S/arrcalleemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrcalleemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrcalleemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrcalleemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrcalleemulti1.checked.c %S/arrcalleemulti2.checked.c
-// RUN: test ! -f %S/arrcalleemulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrcalleemulti2.checked.convert_again.c
-// RUN: rm %S/arrcalleemulti1.checkedALL.c %S/arrcalleemulti2.checkedALL.c
-// RUN: rm %S/arrcalleemulti1.checkedNOALL.c %S/arrcalleemulti2.checkedNOALL.c
-// RUN: rm %S/arrcalleemulti1.checked.c %S/arrcalleemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrcalleemulti2.c b/clang/test/3C/arrcalleemulti2.c
index 74a0605aa45b..8a16cf8a9539 100644
--- a/clang/test/3C/arrcalleemulti2.c
+++ b/clang/test/3C/arrcalleemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrcalleemulti1.c %s
-// RUN: %clang -c %S/arrcalleemulti1.checkedNOALL2.c %S/arrcalleemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrcalleemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrcalleemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrcalleemulti1.checked2.c %S/arrcalleemulti2.checked2.c
-// RUN: test ! -f %S/arrcalleemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrcalleemulti2.checked2.convert_again.c
-// RUN: rm %S/arrcalleemulti1.checkedALL2.c %S/arrcalleemulti2.checkedALL2.c
-// RUN: rm %S/arrcalleemulti1.checkedNOALL2.c %S/arrcalleemulti2.checkedNOALL2.c
-// RUN: rm %S/arrcalleemulti1.checked2.c %S/arrcalleemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrcaller.c b/clang/test/3C/arrcaller.c
index 4de043af116f..52bb790511b8 100644
--- a/clang/test/3C/arrcaller.c
+++ b/clang/test/3C/arrcaller.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/arrcaller.checked.c -- | count 0
-// RUN: rm %S/arrcaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrcallermulti1.c b/clang/test/3C/arrcallermulti1.c
index b2d1c49ec36c..159e64ae7678 100644
--- a/clang/test/3C/arrcallermulti1.c
+++ b/clang/test/3C/arrcallermulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrcallermulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrcallermulti2.c
-// RUN: %clang -c %S/arrcallermulti1.checkedNOALL.c %S/arrcallermulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrcallermulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrcallermulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrcallermulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrcallermulti1.checked.c %S/arrcallermulti2.checked.c
-// RUN: test ! -f %S/arrcallermulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrcallermulti2.checked.convert_again.c
-// RUN: rm %S/arrcallermulti1.checkedALL.c %S/arrcallermulti2.checkedALL.c
-// RUN: rm %S/arrcallermulti1.checkedNOALL.c %S/arrcallermulti2.checkedNOALL.c
-// RUN: rm %S/arrcallermulti1.checked.c %S/arrcallermulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrcallermulti2.c b/clang/test/3C/arrcallermulti2.c
index c1a8a6324c3f..7a1949945144 100644
--- a/clang/test/3C/arrcallermulti2.c
+++ b/clang/test/3C/arrcallermulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrcallermulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrcallermulti1.c %s
-// RUN: %clang -c %S/arrcallermulti1.checkedNOALL2.c %S/arrcallermulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrcallermulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrcallermulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrcallermulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrcallermulti1.checked2.c %S/arrcallermulti2.checked2.c
-// RUN: test ! -f %S/arrcallermulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrcallermulti2.checked2.convert_again.c
-// RUN: rm %S/arrcallermulti1.checkedALL2.c %S/arrcallermulti2.checkedALL2.c
-// RUN: rm %S/arrcallermulti1.checkedNOALL2.c %S/arrcallermulti2.checkedNOALL2.c
-// RUN: rm %S/arrcallermulti1.checked2.c %S/arrcallermulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructboth.c b/clang/test/3C/arrinstructboth.c
index 17e0215982e1..aff8ae6eee7a 100644
--- a/clang/test/3C/arrinstructboth.c
+++ b/clang/test/3C/arrinstructboth.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/arrinstructboth.checked.c -- | count 0
-// RUN: rm %S/arrinstructboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructbothmulti1.c b/clang/test/3C/arrinstructbothmulti1.c
index 3acfb8d8c2c4..fb954673f4d0 100644
--- a/clang/test/3C/arrinstructbothmulti1.c
+++ b/clang/test/3C/arrinstructbothmulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrinstructbothmulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrinstructbothmulti2.c
-// RUN: %clang -c %S/arrinstructbothmulti1.checkedNOALL.c %S/arrinstructbothmulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrinstructbothmulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrinstructbothmulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrinstructbothmulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrinstructbothmulti1.checked.c %S/arrinstructbothmulti2.checked.c
-// RUN: test ! -f %S/arrinstructbothmulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrinstructbothmulti2.checked.convert_again.c
-// RUN: rm %S/arrinstructbothmulti1.checkedALL.c %S/arrinstructbothmulti2.checkedALL.c
-// RUN: rm %S/arrinstructbothmulti1.checkedNOALL.c %S/arrinstructbothmulti2.checkedNOALL.c
-// RUN: rm %S/arrinstructbothmulti1.checked.c %S/arrinstructbothmulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructbothmulti2.c b/clang/test/3C/arrinstructbothmulti2.c
index 6d0107644bc9..2a3df7f26ada 100644
--- a/clang/test/3C/arrinstructbothmulti2.c
+++ b/clang/test/3C/arrinstructbothmulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrinstructbothmulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrinstructbothmulti1.c %s
-// RUN: %clang -c %S/arrinstructbothmulti1.checkedNOALL2.c %S/arrinstructbothmulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrinstructbothmulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrinstructbothmulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrinstructbothmulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrinstructbothmulti1.checked2.c %S/arrinstructbothmulti2.checked2.c
-// RUN: test ! -f %S/arrinstructbothmulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrinstructbothmulti2.checked2.convert_again.c
-// RUN: rm %S/arrinstructbothmulti1.checkedALL2.c %S/arrinstructbothmulti2.checkedALL2.c
-// RUN: rm %S/arrinstructbothmulti1.checkedNOALL2.c %S/arrinstructbothmulti2.checkedNOALL2.c
-// RUN: rm %S/arrinstructbothmulti1.checked2.c %S/arrinstructbothmulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructcallee.c b/clang/test/3C/arrinstructcallee.c
index 4700ad9d9092..4895785741ec 100644
--- a/clang/test/3C/arrinstructcallee.c
+++ b/clang/test/3C/arrinstructcallee.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/arrinstructcallee.checked.c -- | count 0
-// RUN: rm %S/arrinstructcallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructcalleemulti1.c b/clang/test/3C/arrinstructcalleemulti1.c
index c87575012e10..95e8ad8cc290 100644
--- a/clang/test/3C/arrinstructcalleemulti1.c
+++ b/clang/test/3C/arrinstructcalleemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrinstructcalleemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrinstructcalleemulti2.c
-// RUN: %clang -c %S/arrinstructcalleemulti1.checkedNOALL.c %S/arrinstructcalleemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrinstructcalleemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrinstructcalleemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrinstructcalleemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrinstructcalleemulti1.checked.c %S/arrinstructcalleemulti2.checked.c
-// RUN: test ! -f %S/arrinstructcalleemulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrinstructcalleemulti2.checked.convert_again.c
-// RUN: rm %S/arrinstructcalleemulti1.checkedALL.c %S/arrinstructcalleemulti2.checkedALL.c
-// RUN: rm %S/arrinstructcalleemulti1.checkedNOALL.c %S/arrinstructcalleemulti2.checkedNOALL.c
-// RUN: rm %S/arrinstructcalleemulti1.checked.c %S/arrinstructcalleemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructcalleemulti2.c b/clang/test/3C/arrinstructcalleemulti2.c
index ee702552e7ba..2293b133df6f 100644
--- a/clang/test/3C/arrinstructcalleemulti2.c
+++ b/clang/test/3C/arrinstructcalleemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrinstructcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrinstructcalleemulti1.c %s
-// RUN: %clang -c %S/arrinstructcalleemulti1.checkedNOALL2.c %S/arrinstructcalleemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrinstructcalleemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrinstructcalleemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrinstructcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrinstructcalleemulti1.checked2.c %S/arrinstructcalleemulti2.checked2.c
-// RUN: test ! -f %S/arrinstructcalleemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrinstructcalleemulti2.checked2.convert_again.c
-// RUN: rm %S/arrinstructcalleemulti1.checkedALL2.c %S/arrinstructcalleemulti2.checkedALL2.c
-// RUN: rm %S/arrinstructcalleemulti1.checkedNOALL2.c %S/arrinstructcalleemulti2.checkedNOALL2.c
-// RUN: rm %S/arrinstructcalleemulti1.checked2.c %S/arrinstructcalleemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructcaller.c b/clang/test/3C/arrinstructcaller.c
index cb2843ac2e32..63b1c8999531 100644
--- a/clang/test/3C/arrinstructcaller.c
+++ b/clang/test/3C/arrinstructcaller.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/arrinstructcaller.checked.c -- | count 0
-// RUN: rm %S/arrinstructcaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructcallermulti1.c b/clang/test/3C/arrinstructcallermulti1.c
index a41e307d1198..9efb792d0af1 100644
--- a/clang/test/3C/arrinstructcallermulti1.c
+++ b/clang/test/3C/arrinstructcallermulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrinstructcallermulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrinstructcallermulti2.c
-// RUN: %clang -c %S/arrinstructcallermulti1.checkedNOALL.c %S/arrinstructcallermulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrinstructcallermulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrinstructcallermulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrinstructcallermulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrinstructcallermulti1.checked.c %S/arrinstructcallermulti2.checked.c
-// RUN: test ! -f %S/arrinstructcallermulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrinstructcallermulti2.checked.convert_again.c
-// RUN: rm %S/arrinstructcallermulti1.checkedALL.c %S/arrinstructcallermulti2.checkedALL.c
-// RUN: rm %S/arrinstructcallermulti1.checkedNOALL.c %S/arrinstructcallermulti2.checkedNOALL.c
-// RUN: rm %S/arrinstructcallermulti1.checked.c %S/arrinstructcallermulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructcallermulti2.c b/clang/test/3C/arrinstructcallermulti2.c
index 2e2209da7f8f..f20fbdc66503 100644
--- a/clang/test/3C/arrinstructcallermulti2.c
+++ b/clang/test/3C/arrinstructcallermulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrinstructcallermulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrinstructcallermulti1.c %s
-// RUN: %clang -c %S/arrinstructcallermulti1.checkedNOALL2.c %S/arrinstructcallermulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrinstructcallermulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrinstructcallermulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrinstructcallermulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrinstructcallermulti1.checked2.c %S/arrinstructcallermulti2.checked2.c
-// RUN: test ! -f %S/arrinstructcallermulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrinstructcallermulti2.checked2.convert_again.c
-// RUN: rm %S/arrinstructcallermulti1.checkedALL2.c %S/arrinstructcallermulti2.checkedALL2.c
-// RUN: rm %S/arrinstructcallermulti1.checkedNOALL2.c %S/arrinstructcallermulti2.checkedNOALL2.c
-// RUN: rm %S/arrinstructcallermulti1.checked2.c %S/arrinstructcallermulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructprotoboth.c b/clang/test/3C/arrinstructprotoboth.c
index f8602b26b403..5d95e46a3e1b 100644
--- a/clang/test/3C/arrinstructprotoboth.c
+++ b/clang/test/3C/arrinstructprotoboth.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/arrinstructprotoboth.checked.c -- | count 0
-// RUN: rm %S/arrinstructprotoboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructprotocallee.c b/clang/test/3C/arrinstructprotocallee.c
index 2ee4c5ea7692..e1937cc5ce02 100644
--- a/clang/test/3C/arrinstructprotocallee.c
+++ b/clang/test/3C/arrinstructprotocallee.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/arrinstructprotocallee.checked.c -- | count 0
-// RUN: rm %S/arrinstructprotocallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructprotocaller.c b/clang/test/3C/arrinstructprotocaller.c
index bfee2a93598b..726e2fb0a9ff 100644
--- a/clang/test/3C/arrinstructprotocaller.c
+++ b/clang/test/3C/arrinstructprotocaller.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/arrinstructprotocaller.checked.c -- | count 0
-// RUN: rm %S/arrinstructprotocaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructprotosafe.c b/clang/test/3C/arrinstructprotosafe.c
index b80ecc3c4c0b..fa9a52c66077 100644
--- a/clang/test/3C/arrinstructprotosafe.c
+++ b/clang/test/3C/arrinstructprotosafe.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/arrinstructprotosafe.checked.c -- | count 0
-// RUN: rm %S/arrinstructprotosafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructsafe.c b/clang/test/3C/arrinstructsafe.c
index 5f5efab56bc7..33b6ec71fbf1 100644
--- a/clang/test/3C/arrinstructsafe.c
+++ b/clang/test/3C/arrinstructsafe.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/arrinstructsafe.checked.c -- | count 0
-// RUN: rm %S/arrinstructsafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructsafemulti1.c b/clang/test/3C/arrinstructsafemulti1.c
index 9e178e838b74..927f1163e3ba 100644
--- a/clang/test/3C/arrinstructsafemulti1.c
+++ b/clang/test/3C/arrinstructsafemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrinstructsafemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrinstructsafemulti2.c
-// RUN: %clang -c %S/arrinstructsafemulti1.checkedNOALL.c %S/arrinstructsafemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrinstructsafemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrinstructsafemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrinstructsafemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrinstructsafemulti1.checked.c %S/arrinstructsafemulti2.checked.c
-// RUN: test ! -f %S/arrinstructsafemulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrinstructsafemulti2.checked.convert_again.c
-// RUN: rm %S/arrinstructsafemulti1.checkedALL.c %S/arrinstructsafemulti2.checkedALL.c
-// RUN: rm %S/arrinstructsafemulti1.checkedNOALL.c %S/arrinstructsafemulti2.checkedNOALL.c
-// RUN: rm %S/arrinstructsafemulti1.checked.c %S/arrinstructsafemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrinstructsafemulti2.c b/clang/test/3C/arrinstructsafemulti2.c
index 1056e9bcc681..255146e6935b 100644
--- a/clang/test/3C/arrinstructsafemulti2.c
+++ b/clang/test/3C/arrinstructsafemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrinstructsafemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrinstructsafemulti1.c %s
-// RUN: %clang -c %S/arrinstructsafemulti1.checkedNOALL2.c %S/arrinstructsafemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrinstructsafemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrinstructsafemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrinstructsafemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrinstructsafemulti1.checked2.c %S/arrinstructsafemulti2.checked2.c
-// RUN: test ! -f %S/arrinstructsafemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrinstructsafemulti2.checked2.convert_again.c
-// RUN: rm %S/arrinstructsafemulti1.checkedALL2.c %S/arrinstructsafemulti2.checkedALL2.c
-// RUN: rm %S/arrinstructsafemulti1.checkedNOALL2.c %S/arrinstructsafemulti2.checkedNOALL2.c
-// RUN: rm %S/arrinstructsafemulti1.checked2.c %S/arrinstructsafemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructboth.c b/clang/test/3C/arrofstructboth.c
index df980fc5425f..07f952b51a0e 100644
--- a/clang/test/3C/arrofstructboth.c
+++ b/clang/test/3C/arrofstructboth.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/arrofstructboth.checked.c -- | count 0
-// RUN: rm %S/arrofstructboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructbothmulti1.c b/clang/test/3C/arrofstructbothmulti1.c
index f9147f5c674b..fbd2f4cf0e11 100644
--- a/clang/test/3C/arrofstructbothmulti1.c
+++ b/clang/test/3C/arrofstructbothmulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrofstructbothmulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrofstructbothmulti2.c
-// RUN: %clang -c %S/arrofstructbothmulti1.checkedNOALL.c %S/arrofstructbothmulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrofstructbothmulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrofstructbothmulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrofstructbothmulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrofstructbothmulti1.checked.c %S/arrofstructbothmulti2.checked.c
-// RUN: test ! -f %S/arrofstructbothmulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrofstructbothmulti2.checked.convert_again.c
-// RUN: rm %S/arrofstructbothmulti1.checkedALL.c %S/arrofstructbothmulti2.checkedALL.c
-// RUN: rm %S/arrofstructbothmulti1.checkedNOALL.c %S/arrofstructbothmulti2.checkedNOALL.c
-// RUN: rm %S/arrofstructbothmulti1.checked.c %S/arrofstructbothmulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructbothmulti2.c b/clang/test/3C/arrofstructbothmulti2.c
index 49344460784b..b2c968ed8c80 100644
--- a/clang/test/3C/arrofstructbothmulti2.c
+++ b/clang/test/3C/arrofstructbothmulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrofstructbothmulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrofstructbothmulti1.c %s
-// RUN: %clang -c %S/arrofstructbothmulti1.checkedNOALL2.c %S/arrofstructbothmulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrofstructbothmulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrofstructbothmulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrofstructbothmulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrofstructbothmulti1.checked2.c %S/arrofstructbothmulti2.checked2.c
-// RUN: test ! -f %S/arrofstructbothmulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrofstructbothmulti2.checked2.convert_again.c
-// RUN: rm %S/arrofstructbothmulti1.checkedALL2.c %S/arrofstructbothmulti2.checkedALL2.c
-// RUN: rm %S/arrofstructbothmulti1.checkedNOALL2.c %S/arrofstructbothmulti2.checkedNOALL2.c
-// RUN: rm %S/arrofstructbothmulti1.checked2.c %S/arrofstructbothmulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructcallee.c b/clang/test/3C/arrofstructcallee.c
index 794512e9efbc..a7714e64e4ba 100644
--- a/clang/test/3C/arrofstructcallee.c
+++ b/clang/test/3C/arrofstructcallee.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/arrofstructcallee.checked.c -- | count 0
-// RUN: rm %S/arrofstructcallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructcalleemulti1.c b/clang/test/3C/arrofstructcalleemulti1.c
index 8df4b6b21b86..695265d82417 100644
--- a/clang/test/3C/arrofstructcalleemulti1.c
+++ b/clang/test/3C/arrofstructcalleemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrofstructcalleemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrofstructcalleemulti2.c
-// RUN: %clang -c %S/arrofstructcalleemulti1.checkedNOALL.c %S/arrofstructcalleemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrofstructcalleemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrofstructcalleemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrofstructcalleemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrofstructcalleemulti1.checked.c %S/arrofstructcalleemulti2.checked.c
-// RUN: test ! -f %S/arrofstructcalleemulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrofstructcalleemulti2.checked.convert_again.c
-// RUN: rm %S/arrofstructcalleemulti1.checkedALL.c %S/arrofstructcalleemulti2.checkedALL.c
-// RUN: rm %S/arrofstructcalleemulti1.checkedNOALL.c %S/arrofstructcalleemulti2.checkedNOALL.c
-// RUN: rm %S/arrofstructcalleemulti1.checked.c %S/arrofstructcalleemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructcalleemulti2.c b/clang/test/3C/arrofstructcalleemulti2.c
index b0a331042c29..f23ab80d8421 100644
--- a/clang/test/3C/arrofstructcalleemulti2.c
+++ b/clang/test/3C/arrofstructcalleemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrofstructcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrofstructcalleemulti1.c %s
-// RUN: %clang -c %S/arrofstructcalleemulti1.checkedNOALL2.c %S/arrofstructcalleemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrofstructcalleemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrofstructcalleemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrofstructcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrofstructcalleemulti1.checked2.c %S/arrofstructcalleemulti2.checked2.c
-// RUN: test ! -f %S/arrofstructcalleemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrofstructcalleemulti2.checked2.convert_again.c
-// RUN: rm %S/arrofstructcalleemulti1.checkedALL2.c %S/arrofstructcalleemulti2.checkedALL2.c
-// RUN: rm %S/arrofstructcalleemulti1.checkedNOALL2.c %S/arrofstructcalleemulti2.checkedNOALL2.c
-// RUN: rm %S/arrofstructcalleemulti1.checked2.c %S/arrofstructcalleemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructcaller.c b/clang/test/3C/arrofstructcaller.c
index 471aca5be9c1..7a481cc7128d 100644
--- a/clang/test/3C/arrofstructcaller.c
+++ b/clang/test/3C/arrofstructcaller.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/arrofstructcaller.checked.c -- | count 0
-// RUN: rm %S/arrofstructcaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructcallermulti1.c b/clang/test/3C/arrofstructcallermulti1.c
index 066fe5b38024..a1ff06f148ad 100644
--- a/clang/test/3C/arrofstructcallermulti1.c
+++ b/clang/test/3C/arrofstructcallermulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrofstructcallermulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrofstructcallermulti2.c
-// RUN: %clang -c %S/arrofstructcallermulti1.checkedNOALL.c %S/arrofstructcallermulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrofstructcallermulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrofstructcallermulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrofstructcallermulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrofstructcallermulti1.checked.c %S/arrofstructcallermulti2.checked.c
-// RUN: test ! -f %S/arrofstructcallermulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrofstructcallermulti2.checked.convert_again.c
-// RUN: rm %S/arrofstructcallermulti1.checkedALL.c %S/arrofstructcallermulti2.checkedALL.c
-// RUN: rm %S/arrofstructcallermulti1.checkedNOALL.c %S/arrofstructcallermulti2.checkedNOALL.c
-// RUN: rm %S/arrofstructcallermulti1.checked.c %S/arrofstructcallermulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructcallermulti2.c b/clang/test/3C/arrofstructcallermulti2.c
index 1e6040ed36ec..ed97941a8b5b 100644
--- a/clang/test/3C/arrofstructcallermulti2.c
+++ b/clang/test/3C/arrofstructcallermulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrofstructcallermulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrofstructcallermulti1.c %s
-// RUN: %clang -c %S/arrofstructcallermulti1.checkedNOALL2.c %S/arrofstructcallermulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrofstructcallermulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrofstructcallermulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrofstructcallermulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrofstructcallermulti1.checked2.c %S/arrofstructcallermulti2.checked2.c
-// RUN: test ! -f %S/arrofstructcallermulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrofstructcallermulti2.checked2.convert_again.c
-// RUN: rm %S/arrofstructcallermulti1.checkedALL2.c %S/arrofstructcallermulti2.checkedALL2.c
-// RUN: rm %S/arrofstructcallermulti1.checkedNOALL2.c %S/arrofstructcallermulti2.checkedNOALL2.c
-// RUN: rm %S/arrofstructcallermulti1.checked2.c %S/arrofstructcallermulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructprotoboth.c b/clang/test/3C/arrofstructprotoboth.c
index 3e476a1a2331..aa4875a9c2ec 100644
--- a/clang/test/3C/arrofstructprotoboth.c
+++ b/clang/test/3C/arrofstructprotoboth.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/arrofstructprotoboth.checked.c -- | count 0
-// RUN: rm %S/arrofstructprotoboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructprotocallee.c b/clang/test/3C/arrofstructprotocallee.c
index d2be66bcdbf2..4842c15a539b 100644
--- a/clang/test/3C/arrofstructprotocallee.c
+++ b/clang/test/3C/arrofstructprotocallee.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/arrofstructprotocallee.checked.c -- | count 0
-// RUN: rm %S/arrofstructprotocallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructprotocaller.c b/clang/test/3C/arrofstructprotocaller.c
index 4f3cfcf9c9e0..9395a414b2bf 100644
--- a/clang/test/3C/arrofstructprotocaller.c
+++ b/clang/test/3C/arrofstructprotocaller.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/arrofstructprotocaller.checked.c -- | count 0
-// RUN: rm %S/arrofstructprotocaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructprotosafe.c b/clang/test/3C/arrofstructprotosafe.c
index 6891972d483b..3f71cc73c901 100644
--- a/clang/test/3C/arrofstructprotosafe.c
+++ b/clang/test/3C/arrofstructprotosafe.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/arrofstructprotosafe.checked.c -- | count 0
-// RUN: rm %S/arrofstructprotosafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructsafe.c b/clang/test/3C/arrofstructsafe.c
index 74a13e9a24cf..37055a16a394 100644
--- a/clang/test/3C/arrofstructsafe.c
+++ b/clang/test/3C/arrofstructsafe.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/arrofstructsafe.checked.c -- | count 0
-// RUN: rm %S/arrofstructsafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructsafemulti1.c b/clang/test/3C/arrofstructsafemulti1.c
index 9f9266dd049a..191dd2f15d7d 100644
--- a/clang/test/3C/arrofstructsafemulti1.c
+++ b/clang/test/3C/arrofstructsafemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrofstructsafemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrofstructsafemulti2.c
-// RUN: %clang -c %S/arrofstructsafemulti1.checkedNOALL.c %S/arrofstructsafemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrofstructsafemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrofstructsafemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrofstructsafemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrofstructsafemulti1.checked.c %S/arrofstructsafemulti2.checked.c
-// RUN: test ! -f %S/arrofstructsafemulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrofstructsafemulti2.checked.convert_again.c
-// RUN: rm %S/arrofstructsafemulti1.checkedALL.c %S/arrofstructsafemulti2.checkedALL.c
-// RUN: rm %S/arrofstructsafemulti1.checkedNOALL.c %S/arrofstructsafemulti2.checkedNOALL.c
-// RUN: rm %S/arrofstructsafemulti1.checked.c %S/arrofstructsafemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrofstructsafemulti2.c b/clang/test/3C/arrofstructsafemulti2.c
index 287dac29c791..5438eee37552 100644
--- a/clang/test/3C/arrofstructsafemulti2.c
+++ b/clang/test/3C/arrofstructsafemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrofstructsafemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrofstructsafemulti1.c %s
-// RUN: %clang -c %S/arrofstructsafemulti1.checkedNOALL2.c %S/arrofstructsafemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrofstructsafemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrofstructsafemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrofstructsafemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrofstructsafemulti1.checked2.c %S/arrofstructsafemulti2.checked2.c
-// RUN: test ! -f %S/arrofstructsafemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrofstructsafemulti2.checked2.convert_again.c
-// RUN: rm %S/arrofstructsafemulti1.checkedALL2.c %S/arrofstructsafemulti2.checkedALL2.c
-// RUN: rm %S/arrofstructsafemulti1.checkedNOALL2.c %S/arrofstructsafemulti2.checkedNOALL2.c
-// RUN: rm %S/arrofstructsafemulti1.checked2.c %S/arrofstructsafemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrprotoboth.c b/clang/test/3C/arrprotoboth.c
index f5d3b3a3e2c3..51114305d2ae 100644
--- a/clang/test/3C/arrprotoboth.c
+++ b/clang/test/3C/arrprotoboth.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/arrprotoboth.checked.c -- | count 0
-// RUN: rm %S/arrprotoboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrprotocallee.c b/clang/test/3C/arrprotocallee.c
index 9ab0503f2f06..8454915ac160 100644
--- a/clang/test/3C/arrprotocallee.c
+++ b/clang/test/3C/arrprotocallee.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/arrprotocallee.checked.c -- | count 0
-// RUN: rm %S/arrprotocallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrprotocaller.c b/clang/test/3C/arrprotocaller.c
index ec5d6aebb3d8..be5d7d9db3ed 100644
--- a/clang/test/3C/arrprotocaller.c
+++ b/clang/test/3C/arrprotocaller.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/arrprotocaller.checked.c -- | count 0
-// RUN: rm %S/arrprotocaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrprotosafe.c b/clang/test/3C/arrprotosafe.c
index 7be4e529675a..8a031fe500ac 100644
--- a/clang/test/3C/arrprotosafe.c
+++ b/clang/test/3C/arrprotosafe.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/arrprotosafe.checked.c -- | count 0
-// RUN: rm %S/arrprotosafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrsafe.c b/clang/test/3C/arrsafe.c
index 9d4a0b30cabc..b976dee19617 100644
--- a/clang/test/3C/arrsafe.c
+++ b/clang/test/3C/arrsafe.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/arrsafe.checked.c -- | count 0
-// RUN: rm %S/arrsafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrsafemulti1.c b/clang/test/3C/arrsafemulti1.c
index a822b5cd5fef..e60605b1873c 100644
--- a/clang/test/3C/arrsafemulti1.c
+++ b/clang/test/3C/arrsafemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrsafemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrsafemulti2.c
-// RUN: %clang -c %S/arrsafemulti1.checkedNOALL.c %S/arrsafemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrsafemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrsafemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrsafemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrsafemulti1.checked.c %S/arrsafemulti2.checked.c
-// RUN: test ! -f %S/arrsafemulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrsafemulti2.checked.convert_again.c
-// RUN: rm %S/arrsafemulti1.checkedALL.c %S/arrsafemulti2.checkedALL.c
-// RUN: rm %S/arrsafemulti1.checkedNOALL.c %S/arrsafemulti2.checkedNOALL.c
-// RUN: rm %S/arrsafemulti1.checked.c %S/arrsafemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrsafemulti2.c b/clang/test/3C/arrsafemulti2.c
index 4f1d7926bf9c..dda609f78930 100644
--- a/clang/test/3C/arrsafemulti2.c
+++ b/clang/test/3C/arrsafemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrsafemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrsafemulti1.c %s
-// RUN: %clang -c %S/arrsafemulti1.checkedNOALL2.c %S/arrsafemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrsafemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrsafemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrsafemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrsafemulti1.checked2.c %S/arrsafemulti2.checked2.c
-// RUN: test ! -f %S/arrsafemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrsafemulti2.checked2.convert_again.c
-// RUN: rm %S/arrsafemulti1.checkedALL2.c %S/arrsafemulti2.checkedALL2.c
-// RUN: rm %S/arrsafemulti1.checkedNOALL2.c %S/arrsafemulti2.checkedNOALL2.c
-// RUN: rm %S/arrsafemulti1.checked2.c %S/arrsafemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructboth.c b/clang/test/3C/arrstructboth.c
index 38147be9e49d..7423d6be0f32 100644
--- a/clang/test/3C/arrstructboth.c
+++ b/clang/test/3C/arrstructboth.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/arrstructboth.checked.c -- | count 0
-// RUN: rm %S/arrstructboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructbothmulti1.c b/clang/test/3C/arrstructbothmulti1.c
index 58cb71df549b..ebceab3341c8 100644
--- a/clang/test/3C/arrstructbothmulti1.c
+++ b/clang/test/3C/arrstructbothmulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrstructbothmulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrstructbothmulti2.c
-// RUN: %clang -c %S/arrstructbothmulti1.checkedNOALL.c %S/arrstructbothmulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrstructbothmulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrstructbothmulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrstructbothmulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrstructbothmulti1.checked.c %S/arrstructbothmulti2.checked.c
-// RUN: test ! -f %S/arrstructbothmulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrstructbothmulti2.checked.convert_again.c
-// RUN: rm %S/arrstructbothmulti1.checkedALL.c %S/arrstructbothmulti2.checkedALL.c
-// RUN: rm %S/arrstructbothmulti1.checkedNOALL.c %S/arrstructbothmulti2.checkedNOALL.c
-// RUN: rm %S/arrstructbothmulti1.checked.c %S/arrstructbothmulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructbothmulti2.c b/clang/test/3C/arrstructbothmulti2.c
index 931e4d91d177..18de8bcd08f6 100644
--- a/clang/test/3C/arrstructbothmulti2.c
+++ b/clang/test/3C/arrstructbothmulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrstructbothmulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrstructbothmulti1.c %s
-// RUN: %clang -c %S/arrstructbothmulti1.checkedNOALL2.c %S/arrstructbothmulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrstructbothmulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrstructbothmulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrstructbothmulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrstructbothmulti1.checked2.c %S/arrstructbothmulti2.checked2.c
-// RUN: test ! -f %S/arrstructbothmulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrstructbothmulti2.checked2.convert_again.c
-// RUN: rm %S/arrstructbothmulti1.checkedALL2.c %S/arrstructbothmulti2.checkedALL2.c
-// RUN: rm %S/arrstructbothmulti1.checkedNOALL2.c %S/arrstructbothmulti2.checkedNOALL2.c
-// RUN: rm %S/arrstructbothmulti1.checked2.c %S/arrstructbothmulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructcallee.c b/clang/test/3C/arrstructcallee.c
index 0111972ce35e..4de9f1d114ee 100644
--- a/clang/test/3C/arrstructcallee.c
+++ b/clang/test/3C/arrstructcallee.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/arrstructcallee.checked.c -- | count 0
-// RUN: rm %S/arrstructcallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructcalleemulti1.c b/clang/test/3C/arrstructcalleemulti1.c
index e348abfaae69..614a8a78279f 100644
--- a/clang/test/3C/arrstructcalleemulti1.c
+++ b/clang/test/3C/arrstructcalleemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrstructcalleemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrstructcalleemulti2.c
-// RUN: %clang -c %S/arrstructcalleemulti1.checkedNOALL.c %S/arrstructcalleemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrstructcalleemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrstructcalleemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrstructcalleemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrstructcalleemulti1.checked.c %S/arrstructcalleemulti2.checked.c
-// RUN: test ! -f %S/arrstructcalleemulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrstructcalleemulti2.checked.convert_again.c
-// RUN: rm %S/arrstructcalleemulti1.checkedALL.c %S/arrstructcalleemulti2.checkedALL.c
-// RUN: rm %S/arrstructcalleemulti1.checkedNOALL.c %S/arrstructcalleemulti2.checkedNOALL.c
-// RUN: rm %S/arrstructcalleemulti1.checked.c %S/arrstructcalleemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructcalleemulti2.c b/clang/test/3C/arrstructcalleemulti2.c
index 70774ac68c37..99798f2c6843 100644
--- a/clang/test/3C/arrstructcalleemulti2.c
+++ b/clang/test/3C/arrstructcalleemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrstructcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrstructcalleemulti1.c %s
-// RUN: %clang -c %S/arrstructcalleemulti1.checkedNOALL2.c %S/arrstructcalleemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrstructcalleemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrstructcalleemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrstructcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrstructcalleemulti1.checked2.c %S/arrstructcalleemulti2.checked2.c
-// RUN: test ! -f %S/arrstructcalleemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrstructcalleemulti2.checked2.convert_again.c
-// RUN: rm %S/arrstructcalleemulti1.checkedALL2.c %S/arrstructcalleemulti2.checkedALL2.c
-// RUN: rm %S/arrstructcalleemulti1.checkedNOALL2.c %S/arrstructcalleemulti2.checkedNOALL2.c
-// RUN: rm %S/arrstructcalleemulti1.checked2.c %S/arrstructcalleemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructcaller.c b/clang/test/3C/arrstructcaller.c
index 38047bcb6da4..0112fb631422 100644
--- a/clang/test/3C/arrstructcaller.c
+++ b/clang/test/3C/arrstructcaller.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/arrstructcaller.checked.c -- | count 0
-// RUN: rm %S/arrstructcaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructcallermulti1.c b/clang/test/3C/arrstructcallermulti1.c
index fb3734a4e9ef..9a3edd23ea20 100644
--- a/clang/test/3C/arrstructcallermulti1.c
+++ b/clang/test/3C/arrstructcallermulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrstructcallermulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrstructcallermulti2.c
-// RUN: %clang -c %S/arrstructcallermulti1.checkedNOALL.c %S/arrstructcallermulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrstructcallermulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrstructcallermulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrstructcallermulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrstructcallermulti1.checked.c %S/arrstructcallermulti2.checked.c
-// RUN: test ! -f %S/arrstructcallermulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrstructcallermulti2.checked.convert_again.c
-// RUN: rm %S/arrstructcallermulti1.checkedALL.c %S/arrstructcallermulti2.checkedALL.c
-// RUN: rm %S/arrstructcallermulti1.checkedNOALL.c %S/arrstructcallermulti2.checkedNOALL.c
-// RUN: rm %S/arrstructcallermulti1.checked.c %S/arrstructcallermulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructcallermulti2.c b/clang/test/3C/arrstructcallermulti2.c
index 5e4875da7312..6f684e4fedb1 100644
--- a/clang/test/3C/arrstructcallermulti2.c
+++ b/clang/test/3C/arrstructcallermulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrstructcallermulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrstructcallermulti1.c %s
-// RUN: %clang -c %S/arrstructcallermulti1.checkedNOALL2.c %S/arrstructcallermulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrstructcallermulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrstructcallermulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrstructcallermulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrstructcallermulti1.checked2.c %S/arrstructcallermulti2.checked2.c
-// RUN: test ! -f %S/arrstructcallermulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrstructcallermulti2.checked2.convert_again.c
-// RUN: rm %S/arrstructcallermulti1.checkedALL2.c %S/arrstructcallermulti2.checkedALL2.c
-// RUN: rm %S/arrstructcallermulti1.checkedNOALL2.c %S/arrstructcallermulti2.checkedNOALL2.c
-// RUN: rm %S/arrstructcallermulti1.checked2.c %S/arrstructcallermulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructprotoboth.c b/clang/test/3C/arrstructprotoboth.c
index 001151482ba1..0ab54d6ac8f7 100644
--- a/clang/test/3C/arrstructprotoboth.c
+++ b/clang/test/3C/arrstructprotoboth.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/arrstructprotoboth.checked.c -- | count 0
-// RUN: rm %S/arrstructprotoboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructprotocallee.c b/clang/test/3C/arrstructprotocallee.c
index 0c8aa1605ec5..887a9b1f592e 100644
--- a/clang/test/3C/arrstructprotocallee.c
+++ b/clang/test/3C/arrstructprotocallee.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/arrstructprotocallee.checked.c -- | count 0
-// RUN: rm %S/arrstructprotocallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructprotocaller.c b/clang/test/3C/arrstructprotocaller.c
index d4502ad3559d..274a79532f17 100644
--- a/clang/test/3C/arrstructprotocaller.c
+++ b/clang/test/3C/arrstructprotocaller.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/arrstructprotocaller.checked.c -- | count 0
-// RUN: rm %S/arrstructprotocaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructprotosafe.c b/clang/test/3C/arrstructprotosafe.c
index 91d203b3da67..4b4e771470ac 100644
--- a/clang/test/3C/arrstructprotosafe.c
+++ b/clang/test/3C/arrstructprotosafe.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/arrstructprotosafe.checked.c -- | count 0
-// RUN: rm %S/arrstructprotosafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructsafe.c b/clang/test/3C/arrstructsafe.c
index 175ab93b3bd5..9b83363188ab 100644
--- a/clang/test/3C/arrstructsafe.c
+++ b/clang/test/3C/arrstructsafe.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/arrstructsafe.checked.c -- | count 0
-// RUN: rm %S/arrstructsafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructsafemulti1.c b/clang/test/3C/arrstructsafemulti1.c
index 80671c2970c8..68de945ec8da 100644
--- a/clang/test/3C/arrstructsafemulti1.c
+++ b/clang/test/3C/arrstructsafemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/arrstructsafemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/arrstructsafemulti2.c
-// RUN: %clang -c %S/arrstructsafemulti1.checkedNOALL.c %S/arrstructsafemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrstructsafemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrstructsafemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/arrstructsafemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrstructsafemulti1.checked.c %S/arrstructsafemulti2.checked.c
-// RUN: test ! -f %S/arrstructsafemulti1.checked.convert_again.c
-// RUN: test ! -f %S/arrstructsafemulti2.checked.convert_again.c
-// RUN: rm %S/arrstructsafemulti1.checkedALL.c %S/arrstructsafemulti2.checkedALL.c
-// RUN: rm %S/arrstructsafemulti1.checkedNOALL.c %S/arrstructsafemulti2.checkedNOALL.c
-// RUN: rm %S/arrstructsafemulti1.checked.c %S/arrstructsafemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/arrstructsafemulti2.c b/clang/test/3C/arrstructsafemulti2.c
index f9544c729562..6fec3615ae02 100644
--- a/clang/test/3C/arrstructsafemulti2.c
+++ b/clang/test/3C/arrstructsafemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/arrstructsafemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/arrstructsafemulti1.c %s
-// RUN: %clang -c %S/arrstructsafemulti1.checkedNOALL2.c %S/arrstructsafemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/arrstructsafemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/arrstructsafemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/arrstructsafemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/arrstructsafemulti1.checked2.c %S/arrstructsafemulti2.checked2.c
-// RUN: test ! -f %S/arrstructsafemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/arrstructsafemulti2.checked2.convert_again.c
-// RUN: rm %S/arrstructsafemulti1.checkedALL2.c %S/arrstructsafemulti2.checkedALL2.c
-// RUN: rm %S/arrstructsafemulti1.checkedNOALL2.c %S/arrstructsafemulti2.checkedNOALL2.c
-// RUN: rm %S/arrstructsafemulti1.checked2.c %S/arrstructsafemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/b10_allsafepointerstruct.c b/clang/test/3C/b10_allsafepointerstruct.c
index 43b51a5c255e..84aea2e746fb 100644
--- a/clang/test/3C/b10_allsafepointerstruct.c
+++ b/clang/test/3C/b10_allsafepointerstruct.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/b10_allsafepointerstruct.checked.c -- | count 0
-// RUN: rm %S/b10_allsafepointerstruct.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b11_calleestructnp.c b/clang/test/3C/b11_calleestructnp.c
index 0d56dfc61a4c..29957d9ac832 100644
--- a/clang/test/3C/b11_calleestructnp.c
+++ b/clang/test/3C/b11_calleestructnp.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/b11_calleestructnp.checked.c -- | count 0
-// RUN: rm %S/b11_calleestructnp.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b12_callerstructnp.c b/clang/test/3C/b12_callerstructnp.c
index 90622043f8b9..209ed297419d 100644
--- a/clang/test/3C/b12_callerstructnp.c
+++ b/clang/test/3C/b12_callerstructnp.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/b12_callerstructnp.checked.c -- | count 0
-// RUN: rm %S/b12_callerstructnp.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b13_calleestructp.c b/clang/test/3C/b13_calleestructp.c
index bbf456f27189..41923abba0d1 100644
--- a/clang/test/3C/b13_calleestructp.c
+++ b/clang/test/3C/b13_calleestructp.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/b13_calleestructp.checked.c -- | count 0
-// RUN: rm %S/b13_calleestructp.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 #include <stddef.h>
 #include <stddef.h>
 extern _Itype_for_any(T) void *calloc(size_t nmemb, size_t size) : itype(_Array_ptr<T>) byte_count(nmemb * size);
diff --git a/clang/test/3C/b14_callerstructp.c b/clang/test/3C/b14_callerstructp.c
index 0b9c882b62f8..ebc16d01e125 100644
--- a/clang/test/3C/b14_callerstructp.c
+++ b/clang/test/3C/b14_callerstructp.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/b14_callerstructp.checked.c -- | count 0
-// RUN: rm %S/b14_callerstructp.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 #include <stddef.h>
 #include <stddef.h>
 extern _Itype_for_any(T) void *calloc(size_t nmemb, size_t size) : itype(_Array_ptr<T>) byte_count(nmemb * size);
diff --git a/clang/test/3C/b15_calleepointerstruct.c b/clang/test/3C/b15_calleepointerstruct.c
index a75cd6ccaabb..716219eb5bf7 100644
--- a/clang/test/3C/b15_calleepointerstruct.c
+++ b/clang/test/3C/b15_calleepointerstruct.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/b15_calleepointerstruct.checked.c -- | count 0
-// RUN: rm %S/b15_calleepointerstruct.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b16_callerpointerstruct.c b/clang/test/3C/b16_callerpointerstruct.c
index fa13770a0591..8c0ee20fcc0c 100644
--- a/clang/test/3C/b16_callerpointerstruct.c
+++ b/clang/test/3C/b16_callerpointerstruct.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/b16_callerpointerstruct.checked.c -- | count 0
-// RUN: rm %S/b16_callerpointerstruct.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b17_bothstructnp.c b/clang/test/3C/b17_bothstructnp.c
index f3c399a19973..e339b3fb5f47 100644
--- a/clang/test/3C/b17_bothstructnp.c
+++ b/clang/test/3C/b17_bothstructnp.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/b17_bothstructnp.checked.c -- | count 0
-// RUN: rm %S/b17_bothstructnp.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b18_bothstructp.c b/clang/test/3C/b18_bothstructp.c
index 94e6478b2a89..0c5bc93dd5db 100644
--- a/clang/test/3C/b18_bothstructp.c
+++ b/clang/test/3C/b18_bothstructp.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/b18_bothstructp.checked.c -- | count 0
-// RUN: rm %S/b18_bothstructp.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 #include <stddef.h>
 #include <stddef.h>
 extern _Itype_for_any(T) void *calloc(size_t nmemb, size_t size) : itype(_Array_ptr<T>) byte_count(nmemb * size);
diff --git a/clang/test/3C/b19_bothpointerstruct.c b/clang/test/3C/b19_bothpointerstruct.c
index 2885353dbbcb..4d3ed2acf16d 100644
--- a/clang/test/3C/b19_bothpointerstruct.c
+++ b/clang/test/3C/b19_bothpointerstruct.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/b19_bothpointerstruct.checked.c -- | count 0
-// RUN: rm %S/b19_bothpointerstruct.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b1_allsafe.c b/clang/test/3C/b1_allsafe.c
index 0a729f043957..ecedc99b2c39 100644
--- a/clang/test/3C/b1_allsafe.c
+++ b/clang/test/3C/b1_allsafe.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/b1_allsafe.checked.c -- | count 0
-// RUN: rm %S/b1_allsafe.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b20_allsafepointerstructproto.c b/clang/test/3C/b20_allsafepointerstructproto.c
index 10ed4d899ea1..811542605e05 100644
--- a/clang/test/3C/b20_allsafepointerstructproto.c
+++ b/clang/test/3C/b20_allsafepointerstructproto.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/b20_allsafepointerstructproto.checked.c -- | count 0
-// RUN: rm %S/b20_allsafepointerstructproto.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b21_calleepointerstructproto.c b/clang/test/3C/b21_calleepointerstructproto.c
index 42d1b895c54b..1955a68f0cc5 100644
--- a/clang/test/3C/b21_calleepointerstructproto.c
+++ b/clang/test/3C/b21_calleepointerstructproto.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/b21_calleepointerstructproto.checked.c -- | count 0
-// RUN: rm %S/b21_calleepointerstructproto.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b22_callerpointerstructproto.c b/clang/test/3C/b22_callerpointerstructproto.c
index 84aefa769d4a..b48bef3fdd4f 100644
--- a/clang/test/3C/b22_callerpointerstructproto.c
+++ b/clang/test/3C/b22_callerpointerstructproto.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/b22_callerpointerstructproto.checked.c -- | count 0
-// RUN: rm %S/b22_callerpointerstructproto.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b23_explicitunsafecast.c b/clang/test/3C/b23_explicitunsafecast.c
index b4aa39da31f7..d1a6a6f072bb 100644
--- a/clang/test/3C/b23_explicitunsafecast.c
+++ b/clang/test/3C/b23_explicitunsafecast.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/b23_explicitunsafecast.checked.c -- | count 0
-// RUN: rm %S/b23_explicitunsafecast.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b23_retswitchexplicit.c b/clang/test/3C/b23_retswitchexplicit.c
index ab05ace10bb4..012ab044b564 100644
--- a/clang/test/3C/b23_retswitchexplicit.c
+++ b/clang/test/3C/b23_retswitchexplicit.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/b23_retswitchexplicit.checked.c -- | count 0
-// RUN: rm %S/b23_retswitchexplicit.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b24_implicitunsafecast.c b/clang/test/3C/b24_implicitunsafecast.c
index a708348173e4..45f4748c12c8 100644
--- a/clang/test/3C/b24_implicitunsafecast.c
+++ b/clang/test/3C/b24_implicitunsafecast.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/b24_implicitunsafecast.checked.c -- | count 0
-// RUN: rm %S/b24_implicitunsafecast.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b24_retswitchimplicit.c b/clang/test/3C/b24_retswitchimplicit.c
index 1da6e71ba7fd..b271e53aafd1 100644
--- a/clang/test/3C/b24_retswitchimplicit.c
+++ b/clang/test/3C/b24_retswitchimplicit.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/b24_retswitchimplicit.checked.c -- | count 0
-// RUN: rm %S/b24_retswitchimplicit.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b25_castprotosafe.c b/clang/test/3C/b25_castprotosafe.c
index df0dcf339175..18a4b3f52986 100644
--- a/clang/test/3C/b25_castprotosafe.c
+++ b/clang/test/3C/b25_castprotosafe.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/b25_castprotosafe.checked.c -- | count 0
-// RUN: rm %S/b25_castprotosafe.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b26_castprotounsafe.c b/clang/test/3C/b26_castprotounsafe.c
index 1c831ecf8d75..d68f248537a2 100644
--- a/clang/test/3C/b26_castprotounsafe.c
+++ b/clang/test/3C/b26_castprotounsafe.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/b26_castprotounsafe.checked.c -- | count 0
-// RUN: rm %S/b26_castprotounsafe.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b26_castprotounsafeimplicit.c b/clang/test/3C/b26_castprotounsafeimplicit.c
index 189ba3bfbff1..ddfdfbabfb35 100644
--- a/clang/test/3C/b26_castprotounsafeimplicit.c
+++ b/clang/test/3C/b26_castprotounsafeimplicit.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/b26_castprotounsafeimplicit.checked.c -- | count 0
-// RUN: rm %S/b26_castprotounsafeimplicit.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b26_castprotounsafeimplicitretswitch.c b/clang/test/3C/b26_castprotounsafeimplicitretswitch.c
index 9775b4ec9443..5543e98871e5 100644
--- a/clang/test/3C/b26_castprotounsafeimplicitretswitch.c
+++ b/clang/test/3C/b26_castprotounsafeimplicitretswitch.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/b26_castprotounsafeimplicitretswitch.checked.c -- | count 0
-// RUN: rm %S/b26_castprotounsafeimplicitretswitch.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b27_structcastsafe.c b/clang/test/3C/b27_structcastsafe.c
index fdcf6748c242..3aba37444cd2 100644
--- a/clang/test/3C/b27_structcastsafe.c
+++ b/clang/test/3C/b27_structcastsafe.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/b27_structcastsafe.checked.c -- | count 0
-// RUN: rm %S/b27_structcastsafe.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b28_structcastexplicit.c b/clang/test/3C/b28_structcastexplicit.c
index 6f33cd8e521a..7b215db1ce42 100644
--- a/clang/test/3C/b28_structcastexplicit.c
+++ b/clang/test/3C/b28_structcastexplicit.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/b28_structcastexplicit.checked.c -- | count 0
-// RUN: rm %S/b28_structcastexplicit.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b28_structcastimplicit.c b/clang/test/3C/b28_structcastimplicit.c
index 8a799eae4603..bd5e7bc80a1a 100644
--- a/clang/test/3C/b28_structcastimplicit.c
+++ b/clang/test/3C/b28_structcastimplicit.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/b28_structcastimplicit.checked.c -- | count 0
-// RUN: rm %S/b28_structcastimplicit.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b28_structimplicitretcast.c b/clang/test/3C/b28_structimplicitretcast.c
index bd18c9dc0220..66b8445a9ce1 100644
--- a/clang/test/3C/b28_structimplicitretcast.c
+++ b/clang/test/3C/b28_structimplicitretcast.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/b28_structimplicitretcast.checked.c -- | count 0
-// RUN: rm %S/b28_structimplicitretcast.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b29_structprotocastsafe.c b/clang/test/3C/b29_structprotocastsafe.c
index 011116e73ce6..bfe438ab3d29 100644
--- a/clang/test/3C/b29_structprotocastsafe.c
+++ b/clang/test/3C/b29_structprotocastsafe.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/b29_structprotocastsafe.checked.c -- | count 0
-// RUN: rm %S/b29_structprotocastsafe.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b29_structprotocastsafeuseunsafe.c b/clang/test/3C/b29_structprotocastsafeuseunsafe.c
index 4f279e4e4447..1b52fbdad72b 100644
--- a/clang/test/3C/b29_structprotocastsafeuseunsafe.c
+++ b/clang/test/3C/b29_structprotocastsafeuseunsafe.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/b29_structprotocastsafeuseunsafe.checked.c -- | count 0
-// RUN: rm %S/b29_structprotocastsafeuseunsafe.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b2_calleeunsafe.c b/clang/test/3C/b2_calleeunsafe.c
index 1cc15e523c12..0591e861090f 100644
--- a/clang/test/3C/b2_calleeunsafe.c
+++ b/clang/test/3C/b2_calleeunsafe.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/b2_calleeunsafe.checked.c -- | count 0
-// RUN: rm %S/b2_calleeunsafe.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b30_structprotocastexplicitunsafeuseunsafe.c b/clang/test/3C/b30_structprotocastexplicitunsafeuseunsafe.c
index e7b2ba4b8077..fa942309820c 100644
--- a/clang/test/3C/b30_structprotocastexplicitunsafeuseunsafe.c
+++ b/clang/test/3C/b30_structprotocastexplicitunsafeuseunsafe.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/b30_structprotocastexplicitunsafeuseunsafe.checked.c -- | count 0
-// RUN: rm %S/b30_structprotocastexplicitunsafeuseunsafe.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b30_structprotocastimplicitunsafeuseunsafe.c b/clang/test/3C/b30_structprotocastimplicitunsafeuseunsafe.c
index 0ddb18106b16..cc10ef9d606f 100644
--- a/clang/test/3C/b30_structprotocastimplicitunsafeuseunsafe.c
+++ b/clang/test/3C/b30_structprotocastimplicitunsafeuseunsafe.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/b30_structprotocastimplicitunsafeuseunsafe.checked.c -- | count 0
-// RUN: rm %S/b30_structprotocastimplicitunsafeuseunsafe.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b30_structprotocastunsafeexplicit.c b/clang/test/3C/b30_structprotocastunsafeexplicit.c
index 578d969ce52f..23781a46bcc0 100644
--- a/clang/test/3C/b30_structprotocastunsafeexplicit.c
+++ b/clang/test/3C/b30_structprotocastunsafeexplicit.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/b30_structprotocastunsafeexplicit.checked.c -- | count 0
-// RUN: rm %S/b30_structprotocastunsafeexplicit.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b30_structprotocastunsafeimplicit.c b/clang/test/3C/b30_structprotocastunsafeimplicit.c
index 0e6400dca7a9..1211d0e812f1 100644
--- a/clang/test/3C/b30_structprotocastunsafeimplicit.c
+++ b/clang/test/3C/b30_structprotocastunsafeimplicit.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/b30_structprotocastunsafeimplicit.checked.c -- | count 0
-// RUN: rm %S/b30_structprotocastunsafeimplicit.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b30_structprotocastunsafeimplicitretswitch.c b/clang/test/3C/b30_structprotocastunsafeimplicitretswitch.c
index a618e5c9a12b..2e8aaa4a7f75 100644
--- a/clang/test/3C/b30_structprotocastunsafeimplicitretswitch.c
+++ b/clang/test/3C/b30_structprotocastunsafeimplicitretswitch.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/b30_structprotocastunsafeimplicitretswitch.checked.c -- | count 0
-// RUN: rm %S/b30_structprotocastunsafeimplicitretswitch.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b30_structprotoconflict.c b/clang/test/3C/b30_structprotoconflict.c
index 9d456312d89f..a561a80856c7 100644
--- a/clang/test/3C/b30_structprotoconflict.c
+++ b/clang/test/3C/b30_structprotoconflict.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/b30_structprotoconflict.checked.c -- | count 0
-// RUN: rm %S/b30_structprotoconflict.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 #include <stddef.h>
 #include <stddef.h>
 extern _Itype_for_any(T) void *calloc(size_t nmemb, size_t size) : itype(_Array_ptr<T>) byte_count(nmemb * size);
diff --git a/clang/test/3C/b30_structprotoconflictbodyconvert.c b/clang/test/3C/b30_structprotoconflictbodyconvert.c
index d13823c90aaa..2cbda2adccf1 100644
--- a/clang/test/3C/b30_structprotoconflictbodyconvert.c
+++ b/clang/test/3C/b30_structprotoconflictbodyconvert.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/b30_structprotoconflictbodyconvert.checked.c -- | count 0
-// RUN: rm %S/b30_structprotoconflictbodyconvert.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 #include <stddef.h>
 #include <stddef.h>
 extern _Itype_for_any(T) void *calloc(size_t nmemb, size_t size) : itype(_Array_ptr<T>) byte_count(nmemb * size);
diff --git a/clang/test/3C/b3_onecallerunsafe.c b/clang/test/3C/b3_onecallerunsafe.c
index fd28ed0033b4..545f1cccc5d3 100644
--- a/clang/test/3C/b3_onecallerunsafe.c
+++ b/clang/test/3C/b3_onecallerunsafe.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/b3_onecallerunsafe.checked.c -- | count 0
-// RUN: rm %S/b3_onecallerunsafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 #include <stddef.h>
 #include <stddef.h>
 extern _Itype_for_any(T) void *calloc(size_t nmemb, size_t size) : itype(_Array_ptr<T>) byte_count(nmemb * size);
diff --git a/clang/test/3C/b4_bothunsafe.c b/clang/test/3C/b4_bothunsafe.c
index 5a1676dc47b3..b976a06146d0 100644
--- a/clang/test/3C/b4_bothunsafe.c
+++ b/clang/test/3C/b4_bothunsafe.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/b4_bothunsafe.checked.c -- | count 0
-// RUN: rm %S/b4_bothunsafe.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b5_calleeunsafeproto.c b/clang/test/3C/b5_calleeunsafeproto.c
index ee24631c85d3..262700dab1d6 100644
--- a/clang/test/3C/b5_calleeunsafeproto.c
+++ b/clang/test/3C/b5_calleeunsafeproto.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/b5_calleeunsafeproto.checked.c -- | count 0
-// RUN: rm %S/b5_calleeunsafeproto.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b6_callerunsafeproto.c b/clang/test/3C/b6_callerunsafeproto.c
index ad5c46f37400..fae5ec580012 100644
--- a/clang/test/3C/b6_callerunsafeproto.c
+++ b/clang/test/3C/b6_callerunsafeproto.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/b6_callerunsafeproto.checked.c -- | count 0
-// RUN: rm %S/b6_callerunsafeproto.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b7_allsafeproto.c b/clang/test/3C/b7_allsafeproto.c
index f6902275d2f3..623a4d5a6f3e 100644
--- a/clang/test/3C/b7_allsafeproto.c
+++ b/clang/test/3C/b7_allsafeproto.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/b7_allsafeproto.checked.c -- | count 0
-// RUN: rm %S/b7_allsafeproto.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b8_allsafestructnp.c b/clang/test/3C/b8_allsafestructnp.c
index abf1ee77de9a..fafded91fcc3 100644
--- a/clang/test/3C/b8_allsafestructnp.c
+++ b/clang/test/3C/b8_allsafestructnp.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/b8_allsafestructnp.checked.c -- | count 0
-// RUN: rm %S/b8_allsafestructnp.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);
 extern _Itype_for_any(T) void free(void *pointer : itype(_Array_ptr<T>) byte_count(0));
diff --git a/clang/test/3C/b9_allsafestructp.c b/clang/test/3C/b9_allsafestructp.c
index 9c909362178d..db2c646e42c3 100644
--- a/clang/test/3C/b9_allsafestructp.c
+++ b/clang/test/3C/b9_allsafestructp.c
@@ -1,4 +1,4 @@
-// RUN: %S/3c-regtest.py --predefined-script processor %s -t %t --clang '%clang'
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 #include <stddef.h>
 #include <stddef.h>
 extern _Itype_for_any(T) void *calloc(size_t nmemb, size_t size) : itype(_Array_ptr<T>) byte_count(nmemb * size);
diff --git a/clang/test/3C/calloc.c b/clang/test/3C/calloc.c
index 247b7bc19b17..b4aa7ef83f8d 100644
--- a/clang/test/3C/calloc.c
+++ b/clang/test/3C/calloc.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/calloc.checked.c -- | count 0
-// RUN: rm %S/calloc.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 
 #include <stddef.h>
diff --git a/clang/test/3C/canonical_type_cast.c b/clang/test/3C/canonical_type_cast.c
index da9fb53b3e94..231da55ccfe5 100644
--- a/clang/test/3C/canonical_type_cast.c
+++ b/clang/test/3C/canonical_type_cast.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/canonical_type_cast.checked.c -- | count 0
-// RUN: rm %S/canonical_type_cast.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 
 /* Examples from issue #58 */
diff --git a/clang/test/3C/cast.c b/clang/test/3C/cast.c
index 6346e1779c31..05b30e371392 100644
--- a/clang/test/3C/cast.c
+++ b/clang/test/3C/cast.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/cast.checked.c -- | count 0
-// RUN: rm %S/cast.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 int foo(int* p) {
 	//CHECK: int foo(_Ptr<int> p) {
diff --git a/clang/test/3C/checkedregions.c b/clang/test/3C/checkedregions.c
index 992ac010445f..7e82b1eb85f9 100644
--- a/clang/test/3C/checkedregions.c
+++ b/clang/test/3C/checkedregions.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/checkedregions.checked.c -- | count 0
-// RUN: rm %S/checkedregions.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 /* Tests for adding (un)checked regions automatically */
 
 #include <stddef.h> 
diff --git a/clang/test/3C/compound_literal.c b/clang/test/3C/compound_literal.c
index d56c4327905e..1ef5c97bc3aa 100644
--- a/clang/test/3C/compound_literal.c
+++ b/clang/test/3C/compound_literal.c
@@ -1,11 +1,6 @@
 // XFAIL: *
 // Fails dues to issue microsoft#870 but fixed by pull request microsoft#899
-// 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/compound_literal.checked.c -- | diff -w %S/compound_literal.checked.c -
-// RUN: rm %S/compound_literal.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-diff-w %s -t %t --clang '%clang'
 
 struct a {
   int *a;
diff --git a/clang/test/3C/ex1.c b/clang/test/3C/ex1.c
index 6fed5d0571c4..3444ae60114d 100644
--- a/clang/test/3C/ex1.c
+++ b/clang/test/3C/ex1.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/ex1.checked.c -- | count 0
-// RUN: rm %S/ex1.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 void foo() {
   int m = 2;
diff --git a/clang/test/3C/extGVar.c b/clang/test/3C/extGVar.c
index cf5f2101cc75..1d9cfd624f95 100644
--- a/clang/test/3C/extGVar.c
+++ b/clang/test/3C/extGVar.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/extGVar.checked.c -- | count 0
-// RUN: rm %S/extGVar.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 /*what we're interested in*/ 
 extern int *x; 
diff --git a/clang/test/3C/extstructfields.c b/clang/test/3C/extstructfields.c
index 48f6be538ee6..b16fb99bda23 100644
--- a/clang/test/3C/extstructfields.c
+++ b/clang/test/3C/extstructfields.c
@@ -3,12 +3,7 @@
 // reasonable way to write an analogous test that works on Windows.
 // UNSUPPORTED: system-windows
 
-// 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/extstructfields.checked.c -- | count 0
-// RUN: rm %S/extstructfields.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 #include <signal.h>
 
diff --git a/clang/test/3C/fn_sets.c b/clang/test/3C/fn_sets.c
index 036919d4eeac..579abef8b101 100644
--- a/clang/test/3C/fn_sets.c
+++ b/clang/test/3C/fn_sets.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/fn_sets.checked.c -- | count 0
-// RUN: rm %S/fn_sets.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 /* Tests relating to issue #86 Handling sets of functions */
 
 /* In the first test case, y WILD due to the  (int*)5 assignment. This
diff --git a/clang/test/3C/fp.c b/clang/test/3C/fp.c
index 2a25b7e3a2b5..a738774af8a5 100644
--- a/clang/test/3C/fp.c
+++ b/clang/test/3C/fp.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/fp.checked.c -- | count 0
-// RUN: rm %S/fp.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 
 int f(int *p);
diff --git a/clang/test/3C/fp_arith.c b/clang/test/3C/fp_arith.c
index 729dc53e33fe..c71dd8b5e22f 100644
--- a/clang/test/3C/fp_arith.c
+++ b/clang/test/3C/fp_arith.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/fp_arith.checked.c -- | count 0
-// RUN: rm %S/fp_arith.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 /* Tests for the error outlined in issue 74. Pointer arithmetic on function
  pointers with -alltypes active causes the pointers be ARR pointers, but
diff --git a/clang/test/3C/fptrarrboth.c b/clang/test/3C/fptrarrboth.c
index 8d1e8435db6d..2c6f16eeb798 100644
--- a/clang/test/3C/fptrarrboth.c
+++ b/clang/test/3C/fptrarrboth.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/fptrarrboth.checked.c -- | count 0
-// RUN: rm %S/fptrarrboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrbothmulti1.c b/clang/test/3C/fptrarrbothmulti1.c
index 373db8fd40b3..fac3f721ba03 100644
--- a/clang/test/3C/fptrarrbothmulti1.c
+++ b/clang/test/3C/fptrarrbothmulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrarrbothmulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrarrbothmulti2.c
-// RUN: %clang -c %S/fptrarrbothmulti1.checkedNOALL.c %S/fptrarrbothmulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrbothmulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrbothmulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrarrbothmulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrbothmulti1.checked.c %S/fptrarrbothmulti2.checked.c
-// RUN: test ! -f %S/fptrarrbothmulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrarrbothmulti2.checked.convert_again.c
-// RUN: rm %S/fptrarrbothmulti1.checkedALL.c %S/fptrarrbothmulti2.checkedALL.c
-// RUN: rm %S/fptrarrbothmulti1.checkedNOALL.c %S/fptrarrbothmulti2.checkedNOALL.c
-// RUN: rm %S/fptrarrbothmulti1.checked.c %S/fptrarrbothmulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrbothmulti2.c b/clang/test/3C/fptrarrbothmulti2.c
index a2d8604d2419..9ca13e1a50f3 100644
--- a/clang/test/3C/fptrarrbothmulti2.c
+++ b/clang/test/3C/fptrarrbothmulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrarrbothmulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrarrbothmulti1.c %s
-// RUN: %clang -c %S/fptrarrbothmulti1.checkedNOALL2.c %S/fptrarrbothmulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrbothmulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrbothmulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrarrbothmulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrbothmulti1.checked2.c %S/fptrarrbothmulti2.checked2.c
-// RUN: test ! -f %S/fptrarrbothmulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrarrbothmulti2.checked2.convert_again.c
-// RUN: rm %S/fptrarrbothmulti1.checkedALL2.c %S/fptrarrbothmulti2.checkedALL2.c
-// RUN: rm %S/fptrarrbothmulti1.checkedNOALL2.c %S/fptrarrbothmulti2.checkedNOALL2.c
-// RUN: rm %S/fptrarrbothmulti1.checked2.c %S/fptrarrbothmulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrcallee.c b/clang/test/3C/fptrarrcallee.c
index 5f9cf32a3d35..d25736df0cd5 100644
--- a/clang/test/3C/fptrarrcallee.c
+++ b/clang/test/3C/fptrarrcallee.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/fptrarrcallee.checked.c -- | count 0
-// RUN: rm %S/fptrarrcallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrcalleemulti1.c b/clang/test/3C/fptrarrcalleemulti1.c
index 10ce8bbbee64..091d7c783ba0 100644
--- a/clang/test/3C/fptrarrcalleemulti1.c
+++ b/clang/test/3C/fptrarrcalleemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrarrcalleemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrarrcalleemulti2.c
-// RUN: %clang -c %S/fptrarrcalleemulti1.checkedNOALL.c %S/fptrarrcalleemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrcalleemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrcalleemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrarrcalleemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrcalleemulti1.checked.c %S/fptrarrcalleemulti2.checked.c
-// RUN: test ! -f %S/fptrarrcalleemulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrarrcalleemulti2.checked.convert_again.c
-// RUN: rm %S/fptrarrcalleemulti1.checkedALL.c %S/fptrarrcalleemulti2.checkedALL.c
-// RUN: rm %S/fptrarrcalleemulti1.checkedNOALL.c %S/fptrarrcalleemulti2.checkedNOALL.c
-// RUN: rm %S/fptrarrcalleemulti1.checked.c %S/fptrarrcalleemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrcalleemulti2.c b/clang/test/3C/fptrarrcalleemulti2.c
index 24ce4b80d417..a699f3659490 100644
--- a/clang/test/3C/fptrarrcalleemulti2.c
+++ b/clang/test/3C/fptrarrcalleemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrarrcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrarrcalleemulti1.c %s
-// RUN: %clang -c %S/fptrarrcalleemulti1.checkedNOALL2.c %S/fptrarrcalleemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrcalleemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrcalleemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrarrcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrcalleemulti1.checked2.c %S/fptrarrcalleemulti2.checked2.c
-// RUN: test ! -f %S/fptrarrcalleemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrarrcalleemulti2.checked2.convert_again.c
-// RUN: rm %S/fptrarrcalleemulti1.checkedALL2.c %S/fptrarrcalleemulti2.checkedALL2.c
-// RUN: rm %S/fptrarrcalleemulti1.checkedNOALL2.c %S/fptrarrcalleemulti2.checkedNOALL2.c
-// RUN: rm %S/fptrarrcalleemulti1.checked2.c %S/fptrarrcalleemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrcaller.c b/clang/test/3C/fptrarrcaller.c
index a1da93231ea8..994a62c00339 100644
--- a/clang/test/3C/fptrarrcaller.c
+++ b/clang/test/3C/fptrarrcaller.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/fptrarrcaller.checked.c -- | count 0
-// RUN: rm %S/fptrarrcaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrcallermulti1.c b/clang/test/3C/fptrarrcallermulti1.c
index 8e939469927f..5c26d572b2b5 100644
--- a/clang/test/3C/fptrarrcallermulti1.c
+++ b/clang/test/3C/fptrarrcallermulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrarrcallermulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrarrcallermulti2.c
-// RUN: %clang -c %S/fptrarrcallermulti1.checkedNOALL.c %S/fptrarrcallermulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrcallermulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrcallermulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrarrcallermulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrcallermulti1.checked.c %S/fptrarrcallermulti2.checked.c
-// RUN: test ! -f %S/fptrarrcallermulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrarrcallermulti2.checked.convert_again.c
-// RUN: rm %S/fptrarrcallermulti1.checkedALL.c %S/fptrarrcallermulti2.checkedALL.c
-// RUN: rm %S/fptrarrcallermulti1.checkedNOALL.c %S/fptrarrcallermulti2.checkedNOALL.c
-// RUN: rm %S/fptrarrcallermulti1.checked.c %S/fptrarrcallermulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrcallermulti2.c b/clang/test/3C/fptrarrcallermulti2.c
index 0cce4c04ee50..ccdd3abf18e0 100644
--- a/clang/test/3C/fptrarrcallermulti2.c
+++ b/clang/test/3C/fptrarrcallermulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrarrcallermulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrarrcallermulti1.c %s
-// RUN: %clang -c %S/fptrarrcallermulti1.checkedNOALL2.c %S/fptrarrcallermulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrcallermulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrcallermulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrarrcallermulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrcallermulti1.checked2.c %S/fptrarrcallermulti2.checked2.c
-// RUN: test ! -f %S/fptrarrcallermulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrarrcallermulti2.checked2.convert_again.c
-// RUN: rm %S/fptrarrcallermulti1.checkedALL2.c %S/fptrarrcallermulti2.checkedALL2.c
-// RUN: rm %S/fptrarrcallermulti1.checkedNOALL2.c %S/fptrarrcallermulti2.checkedNOALL2.c
-// RUN: rm %S/fptrarrcallermulti1.checked2.c %S/fptrarrcallermulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructboth.c b/clang/test/3C/fptrarrinstructboth.c
index 2d85958ba5ff..52247771fb0d 100644
--- a/clang/test/3C/fptrarrinstructboth.c
+++ b/clang/test/3C/fptrarrinstructboth.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/fptrarrinstructboth.checked.c -- | count 0
-// RUN: rm %S/fptrarrinstructboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructbothmulti1.c b/clang/test/3C/fptrarrinstructbothmulti1.c
index 1dfc25da6ede..3e884d52cc37 100644
--- a/clang/test/3C/fptrarrinstructbothmulti1.c
+++ b/clang/test/3C/fptrarrinstructbothmulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrarrinstructbothmulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrarrinstructbothmulti2.c
-// RUN: %clang -c %S/fptrarrinstructbothmulti1.checkedNOALL.c %S/fptrarrinstructbothmulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrinstructbothmulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrinstructbothmulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrarrinstructbothmulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrinstructbothmulti1.checked.c %S/fptrarrinstructbothmulti2.checked.c
-// RUN: test ! -f %S/fptrarrinstructbothmulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrarrinstructbothmulti2.checked.convert_again.c
-// RUN: rm %S/fptrarrinstructbothmulti1.checkedALL.c %S/fptrarrinstructbothmulti2.checkedALL.c
-// RUN: rm %S/fptrarrinstructbothmulti1.checkedNOALL.c %S/fptrarrinstructbothmulti2.checkedNOALL.c
-// RUN: rm %S/fptrarrinstructbothmulti1.checked.c %S/fptrarrinstructbothmulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructbothmulti2.c b/clang/test/3C/fptrarrinstructbothmulti2.c
index 51bbddaf40b9..39d163c59bfe 100644
--- a/clang/test/3C/fptrarrinstructbothmulti2.c
+++ b/clang/test/3C/fptrarrinstructbothmulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrarrinstructbothmulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrarrinstructbothmulti1.c %s
-// RUN: %clang -c %S/fptrarrinstructbothmulti1.checkedNOALL2.c %S/fptrarrinstructbothmulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrinstructbothmulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrinstructbothmulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrarrinstructbothmulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrinstructbothmulti1.checked2.c %S/fptrarrinstructbothmulti2.checked2.c
-// RUN: test ! -f %S/fptrarrinstructbothmulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrarrinstructbothmulti2.checked2.convert_again.c
-// RUN: rm %S/fptrarrinstructbothmulti1.checkedALL2.c %S/fptrarrinstructbothmulti2.checkedALL2.c
-// RUN: rm %S/fptrarrinstructbothmulti1.checkedNOALL2.c %S/fptrarrinstructbothmulti2.checkedNOALL2.c
-// RUN: rm %S/fptrarrinstructbothmulti1.checked2.c %S/fptrarrinstructbothmulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructcallee.c b/clang/test/3C/fptrarrinstructcallee.c
index 7775021e0b08..0f34389d4f2b 100644
--- a/clang/test/3C/fptrarrinstructcallee.c
+++ b/clang/test/3C/fptrarrinstructcallee.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/fptrarrinstructcallee.checked.c -- | count 0
-// RUN: rm %S/fptrarrinstructcallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructcalleemulti1.c b/clang/test/3C/fptrarrinstructcalleemulti1.c
index 3d762a13ac06..83e910282284 100644
--- a/clang/test/3C/fptrarrinstructcalleemulti1.c
+++ b/clang/test/3C/fptrarrinstructcalleemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrarrinstructcalleemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrarrinstructcalleemulti2.c
-// RUN: %clang -c %S/fptrarrinstructcalleemulti1.checkedNOALL.c %S/fptrarrinstructcalleemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrinstructcalleemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrinstructcalleemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrarrinstructcalleemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrinstructcalleemulti1.checked.c %S/fptrarrinstructcalleemulti2.checked.c
-// RUN: test ! -f %S/fptrarrinstructcalleemulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrarrinstructcalleemulti2.checked.convert_again.c
-// RUN: rm %S/fptrarrinstructcalleemulti1.checkedALL.c %S/fptrarrinstructcalleemulti2.checkedALL.c
-// RUN: rm %S/fptrarrinstructcalleemulti1.checkedNOALL.c %S/fptrarrinstructcalleemulti2.checkedNOALL.c
-// RUN: rm %S/fptrarrinstructcalleemulti1.checked.c %S/fptrarrinstructcalleemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructcalleemulti2.c b/clang/test/3C/fptrarrinstructcalleemulti2.c
index 53adde11698c..ecbfe36ee0ab 100644
--- a/clang/test/3C/fptrarrinstructcalleemulti2.c
+++ b/clang/test/3C/fptrarrinstructcalleemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrarrinstructcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrarrinstructcalleemulti1.c %s
-// RUN: %clang -c %S/fptrarrinstructcalleemulti1.checkedNOALL2.c %S/fptrarrinstructcalleemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrinstructcalleemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrinstructcalleemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrarrinstructcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrinstructcalleemulti1.checked2.c %S/fptrarrinstructcalleemulti2.checked2.c
-// RUN: test ! -f %S/fptrarrinstructcalleemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrarrinstructcalleemulti2.checked2.convert_again.c
-// RUN: rm %S/fptrarrinstructcalleemulti1.checkedALL2.c %S/fptrarrinstructcalleemulti2.checkedALL2.c
-// RUN: rm %S/fptrarrinstructcalleemulti1.checkedNOALL2.c %S/fptrarrinstructcalleemulti2.checkedNOALL2.c
-// RUN: rm %S/fptrarrinstructcalleemulti1.checked2.c %S/fptrarrinstructcalleemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructcaller.c b/clang/test/3C/fptrarrinstructcaller.c
index 0aaf08ac0370..19315fa280e0 100644
--- a/clang/test/3C/fptrarrinstructcaller.c
+++ b/clang/test/3C/fptrarrinstructcaller.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/fptrarrinstructcaller.checked.c -- | count 0
-// RUN: rm %S/fptrarrinstructcaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructcallermulti1.c b/clang/test/3C/fptrarrinstructcallermulti1.c
index 11340fda3cb9..c257692c22ed 100644
--- a/clang/test/3C/fptrarrinstructcallermulti1.c
+++ b/clang/test/3C/fptrarrinstructcallermulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrarrinstructcallermulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrarrinstructcallermulti2.c
-// RUN: %clang -c %S/fptrarrinstructcallermulti1.checkedNOALL.c %S/fptrarrinstructcallermulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrinstructcallermulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrinstructcallermulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrarrinstructcallermulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrinstructcallermulti1.checked.c %S/fptrarrinstructcallermulti2.checked.c
-// RUN: test ! -f %S/fptrarrinstructcallermulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrarrinstructcallermulti2.checked.convert_again.c
-// RUN: rm %S/fptrarrinstructcallermulti1.checkedALL.c %S/fptrarrinstructcallermulti2.checkedALL.c
-// RUN: rm %S/fptrarrinstructcallermulti1.checkedNOALL.c %S/fptrarrinstructcallermulti2.checkedNOALL.c
-// RUN: rm %S/fptrarrinstructcallermulti1.checked.c %S/fptrarrinstructcallermulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructcallermulti2.c b/clang/test/3C/fptrarrinstructcallermulti2.c
index 7d2b169edb6b..bd94721a671d 100644
--- a/clang/test/3C/fptrarrinstructcallermulti2.c
+++ b/clang/test/3C/fptrarrinstructcallermulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrarrinstructcallermulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrarrinstructcallermulti1.c %s
-// RUN: %clang -c %S/fptrarrinstructcallermulti1.checkedNOALL2.c %S/fptrarrinstructcallermulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrinstructcallermulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrinstructcallermulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrarrinstructcallermulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrinstructcallermulti1.checked2.c %S/fptrarrinstructcallermulti2.checked2.c
-// RUN: test ! -f %S/fptrarrinstructcallermulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrarrinstructcallermulti2.checked2.convert_again.c
-// RUN: rm %S/fptrarrinstructcallermulti1.checkedALL2.c %S/fptrarrinstructcallermulti2.checkedALL2.c
-// RUN: rm %S/fptrarrinstructcallermulti1.checkedNOALL2.c %S/fptrarrinstructcallermulti2.checkedNOALL2.c
-// RUN: rm %S/fptrarrinstructcallermulti1.checked2.c %S/fptrarrinstructcallermulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructprotoboth.c b/clang/test/3C/fptrarrinstructprotoboth.c
index a78987307211..ff50ed2c8e22 100644
--- a/clang/test/3C/fptrarrinstructprotoboth.c
+++ b/clang/test/3C/fptrarrinstructprotoboth.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/fptrarrinstructprotoboth.checked.c -- | count 0
-// RUN: rm %S/fptrarrinstructprotoboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructprotocallee.c b/clang/test/3C/fptrarrinstructprotocallee.c
index c64f64819d7d..e9b0b36aef88 100644
--- a/clang/test/3C/fptrarrinstructprotocallee.c
+++ b/clang/test/3C/fptrarrinstructprotocallee.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/fptrarrinstructprotocallee.checked.c -- | count 0
-// RUN: rm %S/fptrarrinstructprotocallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructprotocaller.c b/clang/test/3C/fptrarrinstructprotocaller.c
index 1d71b3a25f62..d6b64a50c7f3 100644
--- a/clang/test/3C/fptrarrinstructprotocaller.c
+++ b/clang/test/3C/fptrarrinstructprotocaller.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/fptrarrinstructprotocaller.checked.c -- | count 0
-// RUN: rm %S/fptrarrinstructprotocaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructprotosafe.c b/clang/test/3C/fptrarrinstructprotosafe.c
index 9a9afda33e31..24f2b27d7b5f 100644
--- a/clang/test/3C/fptrarrinstructprotosafe.c
+++ b/clang/test/3C/fptrarrinstructprotosafe.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/fptrarrinstructprotosafe.checked.c -- | count 0
-// RUN: rm %S/fptrarrinstructprotosafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructsafe.c b/clang/test/3C/fptrarrinstructsafe.c
index 34b08747559f..c46f364f37d3 100644
--- a/clang/test/3C/fptrarrinstructsafe.c
+++ b/clang/test/3C/fptrarrinstructsafe.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/fptrarrinstructsafe.checked.c -- | count 0
-// RUN: rm %S/fptrarrinstructsafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructsafemulti1.c b/clang/test/3C/fptrarrinstructsafemulti1.c
index c430740f51d5..e663a14695ed 100644
--- a/clang/test/3C/fptrarrinstructsafemulti1.c
+++ b/clang/test/3C/fptrarrinstructsafemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrarrinstructsafemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrarrinstructsafemulti2.c
-// RUN: %clang -c %S/fptrarrinstructsafemulti1.checkedNOALL.c %S/fptrarrinstructsafemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrinstructsafemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrinstructsafemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrarrinstructsafemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrinstructsafemulti1.checked.c %S/fptrarrinstructsafemulti2.checked.c
-// RUN: test ! -f %S/fptrarrinstructsafemulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrarrinstructsafemulti2.checked.convert_again.c
-// RUN: rm %S/fptrarrinstructsafemulti1.checkedALL.c %S/fptrarrinstructsafemulti2.checkedALL.c
-// RUN: rm %S/fptrarrinstructsafemulti1.checkedNOALL.c %S/fptrarrinstructsafemulti2.checkedNOALL.c
-// RUN: rm %S/fptrarrinstructsafemulti1.checked.c %S/fptrarrinstructsafemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrinstructsafemulti2.c b/clang/test/3C/fptrarrinstructsafemulti2.c
index a54aaac99a66..f99b286916f6 100644
--- a/clang/test/3C/fptrarrinstructsafemulti2.c
+++ b/clang/test/3C/fptrarrinstructsafemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrarrinstructsafemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrarrinstructsafemulti1.c %s
-// RUN: %clang -c %S/fptrarrinstructsafemulti1.checkedNOALL2.c %S/fptrarrinstructsafemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrinstructsafemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrinstructsafemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrarrinstructsafemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrinstructsafemulti1.checked2.c %S/fptrarrinstructsafemulti2.checked2.c
-// RUN: test ! -f %S/fptrarrinstructsafemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrarrinstructsafemulti2.checked2.convert_again.c
-// RUN: rm %S/fptrarrinstructsafemulti1.checkedALL2.c %S/fptrarrinstructsafemulti2.checkedALL2.c
-// RUN: rm %S/fptrarrinstructsafemulti1.checkedNOALL2.c %S/fptrarrinstructsafemulti2.checkedNOALL2.c
-// RUN: rm %S/fptrarrinstructsafemulti1.checked2.c %S/fptrarrinstructsafemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrprotoboth.c b/clang/test/3C/fptrarrprotoboth.c
index cdf0da8db2ef..908c82e82543 100644
--- a/clang/test/3C/fptrarrprotoboth.c
+++ b/clang/test/3C/fptrarrprotoboth.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/fptrarrprotoboth.checked.c -- | count 0
-// RUN: rm %S/fptrarrprotoboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrprotocallee.c b/clang/test/3C/fptrarrprotocallee.c
index 68cf639ea1e7..0ac6e4ce9b32 100644
--- a/clang/test/3C/fptrarrprotocallee.c
+++ b/clang/test/3C/fptrarrprotocallee.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/fptrarrprotocallee.checked.c -- | count 0
-// RUN: rm %S/fptrarrprotocallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrprotocaller.c b/clang/test/3C/fptrarrprotocaller.c
index 44e4f3e2a9b9..572dbe034631 100644
--- a/clang/test/3C/fptrarrprotocaller.c
+++ b/clang/test/3C/fptrarrprotocaller.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/fptrarrprotocaller.checked.c -- | count 0
-// RUN: rm %S/fptrarrprotocaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrprotosafe.c b/clang/test/3C/fptrarrprotosafe.c
index 6c2eb44550d7..3b06a19b4ec6 100644
--- a/clang/test/3C/fptrarrprotosafe.c
+++ b/clang/test/3C/fptrarrprotosafe.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/fptrarrprotosafe.checked.c -- | count 0
-// RUN: rm %S/fptrarrprotosafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrsafe.c b/clang/test/3C/fptrarrsafe.c
index 4e814034b55f..b44df1e17b4d 100644
--- a/clang/test/3C/fptrarrsafe.c
+++ b/clang/test/3C/fptrarrsafe.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/fptrarrsafe.checked.c -- | count 0
-// RUN: rm %S/fptrarrsafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrsafemulti1.c b/clang/test/3C/fptrarrsafemulti1.c
index 191be2c13693..0fe7c1cf7bd5 100644
--- a/clang/test/3C/fptrarrsafemulti1.c
+++ b/clang/test/3C/fptrarrsafemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrarrsafemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrarrsafemulti2.c
-// RUN: %clang -c %S/fptrarrsafemulti1.checkedNOALL.c %S/fptrarrsafemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrsafemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrsafemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrarrsafemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrsafemulti1.checked.c %S/fptrarrsafemulti2.checked.c
-// RUN: test ! -f %S/fptrarrsafemulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrarrsafemulti2.checked.convert_again.c
-// RUN: rm %S/fptrarrsafemulti1.checkedALL.c %S/fptrarrsafemulti2.checkedALL.c
-// RUN: rm %S/fptrarrsafemulti1.checkedNOALL.c %S/fptrarrsafemulti2.checkedNOALL.c
-// RUN: rm %S/fptrarrsafemulti1.checked.c %S/fptrarrsafemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrsafemulti2.c b/clang/test/3C/fptrarrsafemulti2.c
index 331f8b71d8c9..866fb640881f 100644
--- a/clang/test/3C/fptrarrsafemulti2.c
+++ b/clang/test/3C/fptrarrsafemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrarrsafemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrarrsafemulti1.c %s
-// RUN: %clang -c %S/fptrarrsafemulti1.checkedNOALL2.c %S/fptrarrsafemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrsafemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrsafemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrarrsafemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrsafemulti1.checked2.c %S/fptrarrsafemulti2.checked2.c
-// RUN: test ! -f %S/fptrarrsafemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrarrsafemulti2.checked2.convert_again.c
-// RUN: rm %S/fptrarrsafemulti1.checkedALL2.c %S/fptrarrsafemulti2.checkedALL2.c
-// RUN: rm %S/fptrarrsafemulti1.checkedNOALL2.c %S/fptrarrsafemulti2.checkedNOALL2.c
-// RUN: rm %S/fptrarrsafemulti1.checked2.c %S/fptrarrsafemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructboth.c b/clang/test/3C/fptrarrstructboth.c
index 7a231bdfe29b..c6526433260b 100644
--- a/clang/test/3C/fptrarrstructboth.c
+++ b/clang/test/3C/fptrarrstructboth.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/fptrarrstructboth.checked.c -- | count 0
-// RUN: rm %S/fptrarrstructboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructbothmulti1.c b/clang/test/3C/fptrarrstructbothmulti1.c
index d6c998dabc24..b85aa533f387 100644
--- a/clang/test/3C/fptrarrstructbothmulti1.c
+++ b/clang/test/3C/fptrarrstructbothmulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrarrstructbothmulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrarrstructbothmulti2.c
-// RUN: %clang -c %S/fptrarrstructbothmulti1.checkedNOALL.c %S/fptrarrstructbothmulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrstructbothmulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrstructbothmulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrarrstructbothmulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrstructbothmulti1.checked.c %S/fptrarrstructbothmulti2.checked.c
-// RUN: test ! -f %S/fptrarrstructbothmulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrarrstructbothmulti2.checked.convert_again.c
-// RUN: rm %S/fptrarrstructbothmulti1.checkedALL.c %S/fptrarrstructbothmulti2.checkedALL.c
-// RUN: rm %S/fptrarrstructbothmulti1.checkedNOALL.c %S/fptrarrstructbothmulti2.checkedNOALL.c
-// RUN: rm %S/fptrarrstructbothmulti1.checked.c %S/fptrarrstructbothmulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructbothmulti2.c b/clang/test/3C/fptrarrstructbothmulti2.c
index 5cf5b0067dae..ce601c2ff02d 100644
--- a/clang/test/3C/fptrarrstructbothmulti2.c
+++ b/clang/test/3C/fptrarrstructbothmulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrarrstructbothmulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrarrstructbothmulti1.c %s
-// RUN: %clang -c %S/fptrarrstructbothmulti1.checkedNOALL2.c %S/fptrarrstructbothmulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrstructbothmulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrstructbothmulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrarrstructbothmulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrstructbothmulti1.checked2.c %S/fptrarrstructbothmulti2.checked2.c
-// RUN: test ! -f %S/fptrarrstructbothmulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrarrstructbothmulti2.checked2.convert_again.c
-// RUN: rm %S/fptrarrstructbothmulti1.checkedALL2.c %S/fptrarrstructbothmulti2.checkedALL2.c
-// RUN: rm %S/fptrarrstructbothmulti1.checkedNOALL2.c %S/fptrarrstructbothmulti2.checkedNOALL2.c
-// RUN: rm %S/fptrarrstructbothmulti1.checked2.c %S/fptrarrstructbothmulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructcallee.c b/clang/test/3C/fptrarrstructcallee.c
index 31255e5d6022..1ec3f89d3475 100644
--- a/clang/test/3C/fptrarrstructcallee.c
+++ b/clang/test/3C/fptrarrstructcallee.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/fptrarrstructcallee.checked.c -- | count 0
-// RUN: rm %S/fptrarrstructcallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructcalleemulti1.c b/clang/test/3C/fptrarrstructcalleemulti1.c
index 5c25aa834fbd..66ba4290ba56 100644
--- a/clang/test/3C/fptrarrstructcalleemulti1.c
+++ b/clang/test/3C/fptrarrstructcalleemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrarrstructcalleemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrarrstructcalleemulti2.c
-// RUN: %clang -c %S/fptrarrstructcalleemulti1.checkedNOALL.c %S/fptrarrstructcalleemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrstructcalleemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrstructcalleemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrarrstructcalleemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrstructcalleemulti1.checked.c %S/fptrarrstructcalleemulti2.checked.c
-// RUN: test ! -f %S/fptrarrstructcalleemulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrarrstructcalleemulti2.checked.convert_again.c
-// RUN: rm %S/fptrarrstructcalleemulti1.checkedALL.c %S/fptrarrstructcalleemulti2.checkedALL.c
-// RUN: rm %S/fptrarrstructcalleemulti1.checkedNOALL.c %S/fptrarrstructcalleemulti2.checkedNOALL.c
-// RUN: rm %S/fptrarrstructcalleemulti1.checked.c %S/fptrarrstructcalleemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructcalleemulti2.c b/clang/test/3C/fptrarrstructcalleemulti2.c
index 5f2e8530243f..cb638145fadd 100644
--- a/clang/test/3C/fptrarrstructcalleemulti2.c
+++ b/clang/test/3C/fptrarrstructcalleemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrarrstructcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrarrstructcalleemulti1.c %s
-// RUN: %clang -c %S/fptrarrstructcalleemulti1.checkedNOALL2.c %S/fptrarrstructcalleemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrstructcalleemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrstructcalleemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrarrstructcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrstructcalleemulti1.checked2.c %S/fptrarrstructcalleemulti2.checked2.c
-// RUN: test ! -f %S/fptrarrstructcalleemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrarrstructcalleemulti2.checked2.convert_again.c
-// RUN: rm %S/fptrarrstructcalleemulti1.checkedALL2.c %S/fptrarrstructcalleemulti2.checkedALL2.c
-// RUN: rm %S/fptrarrstructcalleemulti1.checkedNOALL2.c %S/fptrarrstructcalleemulti2.checkedNOALL2.c
-// RUN: rm %S/fptrarrstructcalleemulti1.checked2.c %S/fptrarrstructcalleemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructcaller.c b/clang/test/3C/fptrarrstructcaller.c
index 98850bd982da..657c3de7797c 100644
--- a/clang/test/3C/fptrarrstructcaller.c
+++ b/clang/test/3C/fptrarrstructcaller.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/fptrarrstructcaller.checked.c -- | count 0
-// RUN: rm %S/fptrarrstructcaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructcallermulti1.c b/clang/test/3C/fptrarrstructcallermulti1.c
index 22b83e7f456e..58bb82bd13f2 100644
--- a/clang/test/3C/fptrarrstructcallermulti1.c
+++ b/clang/test/3C/fptrarrstructcallermulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrarrstructcallermulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrarrstructcallermulti2.c
-// RUN: %clang -c %S/fptrarrstructcallermulti1.checkedNOALL.c %S/fptrarrstructcallermulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrstructcallermulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrstructcallermulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrarrstructcallermulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrstructcallermulti1.checked.c %S/fptrarrstructcallermulti2.checked.c
-// RUN: test ! -f %S/fptrarrstructcallermulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrarrstructcallermulti2.checked.convert_again.c
-// RUN: rm %S/fptrarrstructcallermulti1.checkedALL.c %S/fptrarrstructcallermulti2.checkedALL.c
-// RUN: rm %S/fptrarrstructcallermulti1.checkedNOALL.c %S/fptrarrstructcallermulti2.checkedNOALL.c
-// RUN: rm %S/fptrarrstructcallermulti1.checked.c %S/fptrarrstructcallermulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructcallermulti2.c b/clang/test/3C/fptrarrstructcallermulti2.c
index b71e706554f7..43efa7547c75 100644
--- a/clang/test/3C/fptrarrstructcallermulti2.c
+++ b/clang/test/3C/fptrarrstructcallermulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrarrstructcallermulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrarrstructcallermulti1.c %s
-// RUN: %clang -c %S/fptrarrstructcallermulti1.checkedNOALL2.c %S/fptrarrstructcallermulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrstructcallermulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrstructcallermulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrarrstructcallermulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrstructcallermulti1.checked2.c %S/fptrarrstructcallermulti2.checked2.c
-// RUN: test ! -f %S/fptrarrstructcallermulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrarrstructcallermulti2.checked2.convert_again.c
-// RUN: rm %S/fptrarrstructcallermulti1.checkedALL2.c %S/fptrarrstructcallermulti2.checkedALL2.c
-// RUN: rm %S/fptrarrstructcallermulti1.checkedNOALL2.c %S/fptrarrstructcallermulti2.checkedNOALL2.c
-// RUN: rm %S/fptrarrstructcallermulti1.checked2.c %S/fptrarrstructcallermulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructprotoboth.c b/clang/test/3C/fptrarrstructprotoboth.c
index a37bfb293d11..917ae0d8f2eb 100644
--- a/clang/test/3C/fptrarrstructprotoboth.c
+++ b/clang/test/3C/fptrarrstructprotoboth.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/fptrarrstructprotoboth.checked.c -- | count 0
-// RUN: rm %S/fptrarrstructprotoboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructprotocallee.c b/clang/test/3C/fptrarrstructprotocallee.c
index 43459b4be78d..2c5adb1c358f 100644
--- a/clang/test/3C/fptrarrstructprotocallee.c
+++ b/clang/test/3C/fptrarrstructprotocallee.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/fptrarrstructprotocallee.checked.c -- | count 0
-// RUN: rm %S/fptrarrstructprotocallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructprotocaller.c b/clang/test/3C/fptrarrstructprotocaller.c
index 5588be854fb2..97c57f06e2ac 100644
--- a/clang/test/3C/fptrarrstructprotocaller.c
+++ b/clang/test/3C/fptrarrstructprotocaller.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/fptrarrstructprotocaller.checked.c -- | count 0
-// RUN: rm %S/fptrarrstructprotocaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructprotosafe.c b/clang/test/3C/fptrarrstructprotosafe.c
index 3f6ae91410a4..8bbf7c2bc4fb 100644
--- a/clang/test/3C/fptrarrstructprotosafe.c
+++ b/clang/test/3C/fptrarrstructprotosafe.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/fptrarrstructprotosafe.checked.c -- | count 0
-// RUN: rm %S/fptrarrstructprotosafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructsafe.c b/clang/test/3C/fptrarrstructsafe.c
index d6e95d99a3f5..c6823ee8684c 100644
--- a/clang/test/3C/fptrarrstructsafe.c
+++ b/clang/test/3C/fptrarrstructsafe.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/fptrarrstructsafe.checked.c -- | count 0
-// RUN: rm %S/fptrarrstructsafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructsafemulti1.c b/clang/test/3C/fptrarrstructsafemulti1.c
index d9633e3ebaa6..8ee8452554ed 100644
--- a/clang/test/3C/fptrarrstructsafemulti1.c
+++ b/clang/test/3C/fptrarrstructsafemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrarrstructsafemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrarrstructsafemulti2.c
-// RUN: %clang -c %S/fptrarrstructsafemulti1.checkedNOALL.c %S/fptrarrstructsafemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrstructsafemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrstructsafemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrarrstructsafemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrstructsafemulti1.checked.c %S/fptrarrstructsafemulti2.checked.c
-// RUN: test ! -f %S/fptrarrstructsafemulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrarrstructsafemulti2.checked.convert_again.c
-// RUN: rm %S/fptrarrstructsafemulti1.checkedALL.c %S/fptrarrstructsafemulti2.checkedALL.c
-// RUN: rm %S/fptrarrstructsafemulti1.checkedNOALL.c %S/fptrarrstructsafemulti2.checkedNOALL.c
-// RUN: rm %S/fptrarrstructsafemulti1.checked.c %S/fptrarrstructsafemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrarrstructsafemulti2.c b/clang/test/3C/fptrarrstructsafemulti2.c
index af0751724a1b..f9c0bcec6a88 100644
--- a/clang/test/3C/fptrarrstructsafemulti2.c
+++ b/clang/test/3C/fptrarrstructsafemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrarrstructsafemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrarrstructsafemulti1.c %s
-// RUN: %clang -c %S/fptrarrstructsafemulti1.checkedNOALL2.c %S/fptrarrstructsafemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrarrstructsafemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrarrstructsafemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrarrstructsafemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrarrstructsafemulti1.checked2.c %S/fptrarrstructsafemulti2.checked2.c
-// RUN: test ! -f %S/fptrarrstructsafemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrarrstructsafemulti2.checked2.convert_again.c
-// RUN: rm %S/fptrarrstructsafemulti1.checkedALL2.c %S/fptrarrstructsafemulti2.checkedALL2.c
-// RUN: rm %S/fptrarrstructsafemulti1.checkedNOALL2.c %S/fptrarrstructsafemulti2.checkedNOALL2.c
-// RUN: rm %S/fptrarrstructsafemulti1.checked2.c %S/fptrarrstructsafemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructboth.c b/clang/test/3C/fptrinstructboth.c
index 8cbea99caf0f..8241de4211ff 100644
--- a/clang/test/3C/fptrinstructboth.c
+++ b/clang/test/3C/fptrinstructboth.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/fptrinstructboth.checked.c -- | count 0
-// RUN: rm %S/fptrinstructboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructbothmulti1.c b/clang/test/3C/fptrinstructbothmulti1.c
index b12b6518bc13..f9c11f77f722 100644
--- a/clang/test/3C/fptrinstructbothmulti1.c
+++ b/clang/test/3C/fptrinstructbothmulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrinstructbothmulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrinstructbothmulti2.c
-// RUN: %clang -c %S/fptrinstructbothmulti1.checkedNOALL.c %S/fptrinstructbothmulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrinstructbothmulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrinstructbothmulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrinstructbothmulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrinstructbothmulti1.checked.c %S/fptrinstructbothmulti2.checked.c
-// RUN: test ! -f %S/fptrinstructbothmulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrinstructbothmulti2.checked.convert_again.c
-// RUN: rm %S/fptrinstructbothmulti1.checkedALL.c %S/fptrinstructbothmulti2.checkedALL.c
-// RUN: rm %S/fptrinstructbothmulti1.checkedNOALL.c %S/fptrinstructbothmulti2.checkedNOALL.c
-// RUN: rm %S/fptrinstructbothmulti1.checked.c %S/fptrinstructbothmulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructbothmulti2.c b/clang/test/3C/fptrinstructbothmulti2.c
index 75772f3c756e..da06533881d6 100644
--- a/clang/test/3C/fptrinstructbothmulti2.c
+++ b/clang/test/3C/fptrinstructbothmulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrinstructbothmulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrinstructbothmulti1.c %s
-// RUN: %clang -c %S/fptrinstructbothmulti1.checkedNOALL2.c %S/fptrinstructbothmulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrinstructbothmulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrinstructbothmulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrinstructbothmulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrinstructbothmulti1.checked2.c %S/fptrinstructbothmulti2.checked2.c
-// RUN: test ! -f %S/fptrinstructbothmulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrinstructbothmulti2.checked2.convert_again.c
-// RUN: rm %S/fptrinstructbothmulti1.checkedALL2.c %S/fptrinstructbothmulti2.checkedALL2.c
-// RUN: rm %S/fptrinstructbothmulti1.checkedNOALL2.c %S/fptrinstructbothmulti2.checkedNOALL2.c
-// RUN: rm %S/fptrinstructbothmulti1.checked2.c %S/fptrinstructbothmulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructcallee.c b/clang/test/3C/fptrinstructcallee.c
index e4fe990beecb..c27a62b903c8 100644
--- a/clang/test/3C/fptrinstructcallee.c
+++ b/clang/test/3C/fptrinstructcallee.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/fptrinstructcallee.checked.c -- | count 0
-// RUN: rm %S/fptrinstructcallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructcalleemulti1.c b/clang/test/3C/fptrinstructcalleemulti1.c
index 56b1c5d8819e..b2bf65825a34 100644
--- a/clang/test/3C/fptrinstructcalleemulti1.c
+++ b/clang/test/3C/fptrinstructcalleemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrinstructcalleemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrinstructcalleemulti2.c
-// RUN: %clang -c %S/fptrinstructcalleemulti1.checkedNOALL.c %S/fptrinstructcalleemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrinstructcalleemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrinstructcalleemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrinstructcalleemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrinstructcalleemulti1.checked.c %S/fptrinstructcalleemulti2.checked.c
-// RUN: test ! -f %S/fptrinstructcalleemulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrinstructcalleemulti2.checked.convert_again.c
-// RUN: rm %S/fptrinstructcalleemulti1.checkedALL.c %S/fptrinstructcalleemulti2.checkedALL.c
-// RUN: rm %S/fptrinstructcalleemulti1.checkedNOALL.c %S/fptrinstructcalleemulti2.checkedNOALL.c
-// RUN: rm %S/fptrinstructcalleemulti1.checked.c %S/fptrinstructcalleemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructcalleemulti2.c b/clang/test/3C/fptrinstructcalleemulti2.c
index 91a4ab74514e..e8863532fc1a 100644
--- a/clang/test/3C/fptrinstructcalleemulti2.c
+++ b/clang/test/3C/fptrinstructcalleemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrinstructcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrinstructcalleemulti1.c %s
-// RUN: %clang -c %S/fptrinstructcalleemulti1.checkedNOALL2.c %S/fptrinstructcalleemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrinstructcalleemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrinstructcalleemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrinstructcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrinstructcalleemulti1.checked2.c %S/fptrinstructcalleemulti2.checked2.c
-// RUN: test ! -f %S/fptrinstructcalleemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrinstructcalleemulti2.checked2.convert_again.c
-// RUN: rm %S/fptrinstructcalleemulti1.checkedALL2.c %S/fptrinstructcalleemulti2.checkedALL2.c
-// RUN: rm %S/fptrinstructcalleemulti1.checkedNOALL2.c %S/fptrinstructcalleemulti2.checkedNOALL2.c
-// RUN: rm %S/fptrinstructcalleemulti1.checked2.c %S/fptrinstructcalleemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructcaller.c b/clang/test/3C/fptrinstructcaller.c
index ab78e67f5d45..7ed34930279e 100644
--- a/clang/test/3C/fptrinstructcaller.c
+++ b/clang/test/3C/fptrinstructcaller.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/fptrinstructcaller.checked.c -- | count 0
-// RUN: rm %S/fptrinstructcaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructcallermulti1.c b/clang/test/3C/fptrinstructcallermulti1.c
index a7fe04127667..2eb31494cfa6 100644
--- a/clang/test/3C/fptrinstructcallermulti1.c
+++ b/clang/test/3C/fptrinstructcallermulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrinstructcallermulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrinstructcallermulti2.c
-// RUN: %clang -c %S/fptrinstructcallermulti1.checkedNOALL.c %S/fptrinstructcallermulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrinstructcallermulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrinstructcallermulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrinstructcallermulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrinstructcallermulti1.checked.c %S/fptrinstructcallermulti2.checked.c
-// RUN: test ! -f %S/fptrinstructcallermulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrinstructcallermulti2.checked.convert_again.c
-// RUN: rm %S/fptrinstructcallermulti1.checkedALL.c %S/fptrinstructcallermulti2.checkedALL.c
-// RUN: rm %S/fptrinstructcallermulti1.checkedNOALL.c %S/fptrinstructcallermulti2.checkedNOALL.c
-// RUN: rm %S/fptrinstructcallermulti1.checked.c %S/fptrinstructcallermulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructcallermulti2.c b/clang/test/3C/fptrinstructcallermulti2.c
index e5248ef48b67..f856764554b4 100644
--- a/clang/test/3C/fptrinstructcallermulti2.c
+++ b/clang/test/3C/fptrinstructcallermulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrinstructcallermulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrinstructcallermulti1.c %s
-// RUN: %clang -c %S/fptrinstructcallermulti1.checkedNOALL2.c %S/fptrinstructcallermulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrinstructcallermulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrinstructcallermulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrinstructcallermulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrinstructcallermulti1.checked2.c %S/fptrinstructcallermulti2.checked2.c
-// RUN: test ! -f %S/fptrinstructcallermulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrinstructcallermulti2.checked2.convert_again.c
-// RUN: rm %S/fptrinstructcallermulti1.checkedALL2.c %S/fptrinstructcallermulti2.checkedALL2.c
-// RUN: rm %S/fptrinstructcallermulti1.checkedNOALL2.c %S/fptrinstructcallermulti2.checkedNOALL2.c
-// RUN: rm %S/fptrinstructcallermulti1.checked2.c %S/fptrinstructcallermulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructprotoboth.c b/clang/test/3C/fptrinstructprotoboth.c
index f8212b583f4f..b5d4d7f05333 100644
--- a/clang/test/3C/fptrinstructprotoboth.c
+++ b/clang/test/3C/fptrinstructprotoboth.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/fptrinstructprotoboth.checked.c -- | count 0
-// RUN: rm %S/fptrinstructprotoboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructprotocallee.c b/clang/test/3C/fptrinstructprotocallee.c
index ccd8ed194fae..577547d3e5e1 100644
--- a/clang/test/3C/fptrinstructprotocallee.c
+++ b/clang/test/3C/fptrinstructprotocallee.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/fptrinstructprotocallee.checked.c -- | count 0
-// RUN: rm %S/fptrinstructprotocallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructprotocaller.c b/clang/test/3C/fptrinstructprotocaller.c
index ca1cfe6b8e66..ed0554794518 100644
--- a/clang/test/3C/fptrinstructprotocaller.c
+++ b/clang/test/3C/fptrinstructprotocaller.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/fptrinstructprotocaller.checked.c -- | count 0
-// RUN: rm %S/fptrinstructprotocaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructprotosafe.c b/clang/test/3C/fptrinstructprotosafe.c
index 1dba31e08083..c95bd249a4d1 100644
--- a/clang/test/3C/fptrinstructprotosafe.c
+++ b/clang/test/3C/fptrinstructprotosafe.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/fptrinstructprotosafe.checked.c -- | count 0
-// RUN: rm %S/fptrinstructprotosafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructsafe.c b/clang/test/3C/fptrinstructsafe.c
index d5a8acf1977f..c95915193df7 100644
--- a/clang/test/3C/fptrinstructsafe.c
+++ b/clang/test/3C/fptrinstructsafe.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/fptrinstructsafe.checked.c -- | count 0
-// RUN: rm %S/fptrinstructsafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructsafemulti1.c b/clang/test/3C/fptrinstructsafemulti1.c
index e1932e01b831..e26a66135e5d 100644
--- a/clang/test/3C/fptrinstructsafemulti1.c
+++ b/clang/test/3C/fptrinstructsafemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrinstructsafemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrinstructsafemulti2.c
-// RUN: %clang -c %S/fptrinstructsafemulti1.checkedNOALL.c %S/fptrinstructsafemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrinstructsafemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrinstructsafemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrinstructsafemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrinstructsafemulti1.checked.c %S/fptrinstructsafemulti2.checked.c
-// RUN: test ! -f %S/fptrinstructsafemulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrinstructsafemulti2.checked.convert_again.c
-// RUN: rm %S/fptrinstructsafemulti1.checkedALL.c %S/fptrinstructsafemulti2.checkedALL.c
-// RUN: rm %S/fptrinstructsafemulti1.checkedNOALL.c %S/fptrinstructsafemulti2.checkedNOALL.c
-// RUN: rm %S/fptrinstructsafemulti1.checked.c %S/fptrinstructsafemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrinstructsafemulti2.c b/clang/test/3C/fptrinstructsafemulti2.c
index 536caf088b1b..416aecdbfa02 100644
--- a/clang/test/3C/fptrinstructsafemulti2.c
+++ b/clang/test/3C/fptrinstructsafemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrinstructsafemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrinstructsafemulti1.c %s
-// RUN: %clang -c %S/fptrinstructsafemulti1.checkedNOALL2.c %S/fptrinstructsafemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrinstructsafemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrinstructsafemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrinstructsafemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrinstructsafemulti1.checked2.c %S/fptrinstructsafemulti2.checked2.c
-// RUN: test ! -f %S/fptrinstructsafemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrinstructsafemulti2.checked2.convert_again.c
-// RUN: rm %S/fptrinstructsafemulti1.checkedALL2.c %S/fptrinstructsafemulti2.checkedALL2.c
-// RUN: rm %S/fptrinstructsafemulti1.checkedNOALL2.c %S/fptrinstructsafemulti2.checkedNOALL2.c
-// RUN: rm %S/fptrinstructsafemulti1.checked2.c %S/fptrinstructsafemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafeboth.c b/clang/test/3C/fptrsafeboth.c
index cf86f652df01..5e061ee3bc49 100644
--- a/clang/test/3C/fptrsafeboth.c
+++ b/clang/test/3C/fptrsafeboth.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/fptrsafeboth.checked.c -- | count 0
-// RUN: rm %S/fptrsafeboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafebothmulti1.c b/clang/test/3C/fptrsafebothmulti1.c
index 9e0818affd81..95ff3e4f3e03 100644
--- a/clang/test/3C/fptrsafebothmulti1.c
+++ b/clang/test/3C/fptrsafebothmulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrsafebothmulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrsafebothmulti2.c
-// RUN: %clang -c %S/fptrsafebothmulti1.checkedNOALL.c %S/fptrsafebothmulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrsafebothmulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrsafebothmulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrsafebothmulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrsafebothmulti1.checked.c %S/fptrsafebothmulti2.checked.c
-// RUN: test ! -f %S/fptrsafebothmulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrsafebothmulti2.checked.convert_again.c
-// RUN: rm %S/fptrsafebothmulti1.checkedALL.c %S/fptrsafebothmulti2.checkedALL.c
-// RUN: rm %S/fptrsafebothmulti1.checkedNOALL.c %S/fptrsafebothmulti2.checkedNOALL.c
-// RUN: rm %S/fptrsafebothmulti1.checked.c %S/fptrsafebothmulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafebothmulti2.c b/clang/test/3C/fptrsafebothmulti2.c
index 0a69d2080e83..92ae00f5b06a 100644
--- a/clang/test/3C/fptrsafebothmulti2.c
+++ b/clang/test/3C/fptrsafebothmulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrsafebothmulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrsafebothmulti1.c %s
-// RUN: %clang -c %S/fptrsafebothmulti1.checkedNOALL2.c %S/fptrsafebothmulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrsafebothmulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrsafebothmulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrsafebothmulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrsafebothmulti1.checked2.c %S/fptrsafebothmulti2.checked2.c
-// RUN: test ! -f %S/fptrsafebothmulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrsafebothmulti2.checked2.convert_again.c
-// RUN: rm %S/fptrsafebothmulti1.checkedALL2.c %S/fptrsafebothmulti2.checkedALL2.c
-// RUN: rm %S/fptrsafebothmulti1.checkedNOALL2.c %S/fptrsafebothmulti2.checkedNOALL2.c
-// RUN: rm %S/fptrsafebothmulti1.checked2.c %S/fptrsafebothmulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafecallee.c b/clang/test/3C/fptrsafecallee.c
index 014145a08985..97f2fb86e06a 100644
--- a/clang/test/3C/fptrsafecallee.c
+++ b/clang/test/3C/fptrsafecallee.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/fptrsafecallee.checked.c -- | count 0
-// RUN: rm %S/fptrsafecallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafecalleemulti1.c b/clang/test/3C/fptrsafecalleemulti1.c
index 0837b2c7b792..7bb53b9463d9 100644
--- a/clang/test/3C/fptrsafecalleemulti1.c
+++ b/clang/test/3C/fptrsafecalleemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrsafecalleemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrsafecalleemulti2.c
-// RUN: %clang -c %S/fptrsafecalleemulti1.checkedNOALL.c %S/fptrsafecalleemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrsafecalleemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrsafecalleemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrsafecalleemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrsafecalleemulti1.checked.c %S/fptrsafecalleemulti2.checked.c
-// RUN: test ! -f %S/fptrsafecalleemulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrsafecalleemulti2.checked.convert_again.c
-// RUN: rm %S/fptrsafecalleemulti1.checkedALL.c %S/fptrsafecalleemulti2.checkedALL.c
-// RUN: rm %S/fptrsafecalleemulti1.checkedNOALL.c %S/fptrsafecalleemulti2.checkedNOALL.c
-// RUN: rm %S/fptrsafecalleemulti1.checked.c %S/fptrsafecalleemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafecalleemulti2.c b/clang/test/3C/fptrsafecalleemulti2.c
index fd850c6d2cf0..3e574e18d33e 100644
--- a/clang/test/3C/fptrsafecalleemulti2.c
+++ b/clang/test/3C/fptrsafecalleemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrsafecalleemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrsafecalleemulti1.c %s
-// RUN: %clang -c %S/fptrsafecalleemulti1.checkedNOALL2.c %S/fptrsafecalleemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrsafecalleemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrsafecalleemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrsafecalleemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrsafecalleemulti1.checked2.c %S/fptrsafecalleemulti2.checked2.c
-// RUN: test ! -f %S/fptrsafecalleemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrsafecalleemulti2.checked2.convert_again.c
-// RUN: rm %S/fptrsafecalleemulti1.checkedALL2.c %S/fptrsafecalleemulti2.checkedALL2.c
-// RUN: rm %S/fptrsafecalleemulti1.checkedNOALL2.c %S/fptrsafecalleemulti2.checkedNOALL2.c
-// RUN: rm %S/fptrsafecalleemulti1.checked2.c %S/fptrsafecalleemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafecaller.c b/clang/test/3C/fptrsafecaller.c
index f06c563a4d95..29d68456feb2 100644
--- a/clang/test/3C/fptrsafecaller.c
+++ b/clang/test/3C/fptrsafecaller.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/fptrsafecaller.checked.c -- | count 0
-// RUN: rm %S/fptrsafecaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafecallermulti1.c b/clang/test/3C/fptrsafecallermulti1.c
index 4c00e4afb6ef..b165ca04a18b 100644
--- a/clang/test/3C/fptrsafecallermulti1.c
+++ b/clang/test/3C/fptrsafecallermulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrsafecallermulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrsafecallermulti2.c
-// RUN: %clang -c %S/fptrsafecallermulti1.checkedNOALL.c %S/fptrsafecallermulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrsafecallermulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrsafecallermulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrsafecallermulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrsafecallermulti1.checked.c %S/fptrsafecallermulti2.checked.c
-// RUN: test ! -f %S/fptrsafecallermulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrsafecallermulti2.checked.convert_again.c
-// RUN: rm %S/fptrsafecallermulti1.checkedALL.c %S/fptrsafecallermulti2.checkedALL.c
-// RUN: rm %S/fptrsafecallermulti1.checkedNOALL.c %S/fptrsafecallermulti2.checkedNOALL.c
-// RUN: rm %S/fptrsafecallermulti1.checked.c %S/fptrsafecallermulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafecallermulti2.c b/clang/test/3C/fptrsafecallermulti2.c
index 3613da097e96..96a6d0667bee 100644
--- a/clang/test/3C/fptrsafecallermulti2.c
+++ b/clang/test/3C/fptrsafecallermulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrsafecallermulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrsafecallermulti1.c %s
-// RUN: %clang -c %S/fptrsafecallermulti1.checkedNOALL2.c %S/fptrsafecallermulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrsafecallermulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrsafecallermulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrsafecallermulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrsafecallermulti1.checked2.c %S/fptrsafecallermulti2.checked2.c
-// RUN: test ! -f %S/fptrsafecallermulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrsafecallermulti2.checked2.convert_again.c
-// RUN: rm %S/fptrsafecallermulti1.checkedALL2.c %S/fptrsafecallermulti2.checkedALL2.c
-// RUN: rm %S/fptrsafecallermulti1.checkedNOALL2.c %S/fptrsafecallermulti2.checkedNOALL2.c
-// RUN: rm %S/fptrsafecallermulti1.checked2.c %S/fptrsafecallermulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafeprotoboth.c b/clang/test/3C/fptrsafeprotoboth.c
index 8e9283962347..4e30b0168efc 100644
--- a/clang/test/3C/fptrsafeprotoboth.c
+++ b/clang/test/3C/fptrsafeprotoboth.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/fptrsafeprotoboth.checked.c -- | count 0
-// RUN: rm %S/fptrsafeprotoboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafeprotocallee.c b/clang/test/3C/fptrsafeprotocallee.c
index 7f48ae6ca758..fc37ee6dc5aa 100644
--- a/clang/test/3C/fptrsafeprotocallee.c
+++ b/clang/test/3C/fptrsafeprotocallee.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/fptrsafeprotocallee.checked.c -- | count 0
-// RUN: rm %S/fptrsafeprotocallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafeprotocaller.c b/clang/test/3C/fptrsafeprotocaller.c
index f8ade4620a61..982ebdca030d 100644
--- a/clang/test/3C/fptrsafeprotocaller.c
+++ b/clang/test/3C/fptrsafeprotocaller.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/fptrsafeprotocaller.checked.c -- | count 0
-// RUN: rm %S/fptrsafeprotocaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafeprotosafe.c b/clang/test/3C/fptrsafeprotosafe.c
index 724826bbbc60..24a4d648d680 100644
--- a/clang/test/3C/fptrsafeprotosafe.c
+++ b/clang/test/3C/fptrsafeprotosafe.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/fptrsafeprotosafe.checked.c -- | count 0
-// RUN: rm %S/fptrsafeprotosafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafesafe.c b/clang/test/3C/fptrsafesafe.c
index 8f1e7c159af3..4bb19ed9b124 100644
--- a/clang/test/3C/fptrsafesafe.c
+++ b/clang/test/3C/fptrsafesafe.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/fptrsafesafe.checked.c -- | count 0
-// RUN: rm %S/fptrsafesafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafesafemulti1.c b/clang/test/3C/fptrsafesafemulti1.c
index 4da9a3b98d74..b787ce2e9703 100644
--- a/clang/test/3C/fptrsafesafemulti1.c
+++ b/clang/test/3C/fptrsafesafemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrsafesafemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrsafesafemulti2.c
-// RUN: %clang -c %S/fptrsafesafemulti1.checkedNOALL.c %S/fptrsafesafemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrsafesafemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrsafesafemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrsafesafemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrsafesafemulti1.checked.c %S/fptrsafesafemulti2.checked.c
-// RUN: test ! -f %S/fptrsafesafemulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrsafesafemulti2.checked.convert_again.c
-// RUN: rm %S/fptrsafesafemulti1.checkedALL.c %S/fptrsafesafemulti2.checkedALL.c
-// RUN: rm %S/fptrsafesafemulti1.checkedNOALL.c %S/fptrsafesafemulti2.checkedNOALL.c
-// RUN: rm %S/fptrsafesafemulti1.checked.c %S/fptrsafesafemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrsafesafemulti2.c b/clang/test/3C/fptrsafesafemulti2.c
index 13ba08594305..0a9667854716 100644
--- a/clang/test/3C/fptrsafesafemulti2.c
+++ b/clang/test/3C/fptrsafesafemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrsafesafemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrsafesafemulti1.c %s
-// RUN: %clang -c %S/fptrsafesafemulti1.checkedNOALL2.c %S/fptrsafesafemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrsafesafemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrsafesafemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrsafesafemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrsafesafemulti1.checked2.c %S/fptrsafesafemulti2.checked2.c
-// RUN: test ! -f %S/fptrsafesafemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrsafesafemulti2.checked2.convert_again.c
-// RUN: rm %S/fptrsafesafemulti1.checkedALL2.c %S/fptrsafesafemulti2.checkedALL2.c
-// RUN: rm %S/fptrsafesafemulti1.checkedNOALL2.c %S/fptrsafesafemulti2.checkedNOALL2.c
-// RUN: rm %S/fptrsafesafemulti1.checked2.c %S/fptrsafesafemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafeboth.c b/clang/test/3C/fptrunsafeboth.c
index 5c71eb2006e0..fbae6e541920 100644
--- a/clang/test/3C/fptrunsafeboth.c
+++ b/clang/test/3C/fptrunsafeboth.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/fptrunsafeboth.checked.c -- | count 0
-// RUN: rm %S/fptrunsafeboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafebothmulti1.c b/clang/test/3C/fptrunsafebothmulti1.c
index 1876fd05a967..8bbc29c182b9 100644
--- a/clang/test/3C/fptrunsafebothmulti1.c
+++ b/clang/test/3C/fptrunsafebothmulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrunsafebothmulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrunsafebothmulti2.c
-// RUN: %clang -c %S/fptrunsafebothmulti1.checkedNOALL.c %S/fptrunsafebothmulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrunsafebothmulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrunsafebothmulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrunsafebothmulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrunsafebothmulti1.checked.c %S/fptrunsafebothmulti2.checked.c
-// RUN: test ! -f %S/fptrunsafebothmulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrunsafebothmulti2.checked.convert_again.c
-// RUN: rm %S/fptrunsafebothmulti1.checkedALL.c %S/fptrunsafebothmulti2.checkedALL.c
-// RUN: rm %S/fptrunsafebothmulti1.checkedNOALL.c %S/fptrunsafebothmulti2.checkedNOALL.c
-// RUN: rm %S/fptrunsafebothmulti1.checked.c %S/fptrunsafebothmulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafebothmulti2.c b/clang/test/3C/fptrunsafebothmulti2.c
index 770828b1ccfc..505a82e115dd 100644
--- a/clang/test/3C/fptrunsafebothmulti2.c
+++ b/clang/test/3C/fptrunsafebothmulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrunsafebothmulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrunsafebothmulti1.c %s
-// RUN: %clang -c %S/fptrunsafebothmulti1.checkedNOALL2.c %S/fptrunsafebothmulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrunsafebothmulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrunsafebothmulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrunsafebothmulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrunsafebothmulti1.checked2.c %S/fptrunsafebothmulti2.checked2.c
-// RUN: test ! -f %S/fptrunsafebothmulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrunsafebothmulti2.checked2.convert_again.c
-// RUN: rm %S/fptrunsafebothmulti1.checkedALL2.c %S/fptrunsafebothmulti2.checkedALL2.c
-// RUN: rm %S/fptrunsafebothmulti1.checkedNOALL2.c %S/fptrunsafebothmulti2.checkedNOALL2.c
-// RUN: rm %S/fptrunsafebothmulti1.checked2.c %S/fptrunsafebothmulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafecallee.c b/clang/test/3C/fptrunsafecallee.c
index ddf84c4f3c0c..459ea69976e9 100644
--- a/clang/test/3C/fptrunsafecallee.c
+++ b/clang/test/3C/fptrunsafecallee.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/fptrunsafecallee.checked.c -- | count 0
-// RUN: rm %S/fptrunsafecallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafecalleemulti1.c b/clang/test/3C/fptrunsafecalleemulti1.c
index 784ec9642bcd..4f75ff769125 100644
--- a/clang/test/3C/fptrunsafecalleemulti1.c
+++ b/clang/test/3C/fptrunsafecalleemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrunsafecalleemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrunsafecalleemulti2.c
-// RUN: %clang -c %S/fptrunsafecalleemulti1.checkedNOALL.c %S/fptrunsafecalleemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrunsafecalleemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrunsafecalleemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrunsafecalleemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrunsafecalleemulti1.checked.c %S/fptrunsafecalleemulti2.checked.c
-// RUN: test ! -f %S/fptrunsafecalleemulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrunsafecalleemulti2.checked.convert_again.c
-// RUN: rm %S/fptrunsafecalleemulti1.checkedALL.c %S/fptrunsafecalleemulti2.checkedALL.c
-// RUN: rm %S/fptrunsafecalleemulti1.checkedNOALL.c %S/fptrunsafecalleemulti2.checkedNOALL.c
-// RUN: rm %S/fptrunsafecalleemulti1.checked.c %S/fptrunsafecalleemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafecalleemulti2.c b/clang/test/3C/fptrunsafecalleemulti2.c
index 1359b39c7b75..7cc0d671fc18 100644
--- a/clang/test/3C/fptrunsafecalleemulti2.c
+++ b/clang/test/3C/fptrunsafecalleemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrunsafecalleemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrunsafecalleemulti1.c %s
-// RUN: %clang -c %S/fptrunsafecalleemulti1.checkedNOALL2.c %S/fptrunsafecalleemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrunsafecalleemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrunsafecalleemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrunsafecalleemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrunsafecalleemulti1.checked2.c %S/fptrunsafecalleemulti2.checked2.c
-// RUN: test ! -f %S/fptrunsafecalleemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrunsafecalleemulti2.checked2.convert_again.c
-// RUN: rm %S/fptrunsafecalleemulti1.checkedALL2.c %S/fptrunsafecalleemulti2.checkedALL2.c
-// RUN: rm %S/fptrunsafecalleemulti1.checkedNOALL2.c %S/fptrunsafecalleemulti2.checkedNOALL2.c
-// RUN: rm %S/fptrunsafecalleemulti1.checked2.c %S/fptrunsafecalleemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafecaller.c b/clang/test/3C/fptrunsafecaller.c
index c7cf7fb365d2..d50f56feb1f1 100644
--- a/clang/test/3C/fptrunsafecaller.c
+++ b/clang/test/3C/fptrunsafecaller.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/fptrunsafecaller.checked.c -- | count 0
-// RUN: rm %S/fptrunsafecaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafecallermulti1.c b/clang/test/3C/fptrunsafecallermulti1.c
index 25a98ab59e05..a5b4c144c47b 100644
--- a/clang/test/3C/fptrunsafecallermulti1.c
+++ b/clang/test/3C/fptrunsafecallermulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrunsafecallermulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrunsafecallermulti2.c
-// RUN: %clang -c %S/fptrunsafecallermulti1.checkedNOALL.c %S/fptrunsafecallermulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrunsafecallermulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrunsafecallermulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrunsafecallermulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrunsafecallermulti1.checked.c %S/fptrunsafecallermulti2.checked.c
-// RUN: test ! -f %S/fptrunsafecallermulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrunsafecallermulti2.checked.convert_again.c
-// RUN: rm %S/fptrunsafecallermulti1.checkedALL.c %S/fptrunsafecallermulti2.checkedALL.c
-// RUN: rm %S/fptrunsafecallermulti1.checkedNOALL.c %S/fptrunsafecallermulti2.checkedNOALL.c
-// RUN: rm %S/fptrunsafecallermulti1.checked.c %S/fptrunsafecallermulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafecallermulti2.c b/clang/test/3C/fptrunsafecallermulti2.c
index 6a6fccefd1ba..c4b2de471fb6 100644
--- a/clang/test/3C/fptrunsafecallermulti2.c
+++ b/clang/test/3C/fptrunsafecallermulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrunsafecallermulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrunsafecallermulti1.c %s
-// RUN: %clang -c %S/fptrunsafecallermulti1.checkedNOALL2.c %S/fptrunsafecallermulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrunsafecallermulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrunsafecallermulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrunsafecallermulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrunsafecallermulti1.checked2.c %S/fptrunsafecallermulti2.checked2.c
-// RUN: test ! -f %S/fptrunsafecallermulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrunsafecallermulti2.checked2.convert_again.c
-// RUN: rm %S/fptrunsafecallermulti1.checkedALL2.c %S/fptrunsafecallermulti2.checkedALL2.c
-// RUN: rm %S/fptrunsafecallermulti1.checkedNOALL2.c %S/fptrunsafecallermulti2.checkedNOALL2.c
-// RUN: rm %S/fptrunsafecallermulti1.checked2.c %S/fptrunsafecallermulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafeprotoboth.c b/clang/test/3C/fptrunsafeprotoboth.c
index c343b06363a9..2b20f5be3300 100644
--- a/clang/test/3C/fptrunsafeprotoboth.c
+++ b/clang/test/3C/fptrunsafeprotoboth.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/fptrunsafeprotoboth.checked.c -- | count 0
-// RUN: rm %S/fptrunsafeprotoboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafeprotocallee.c b/clang/test/3C/fptrunsafeprotocallee.c
index 59fc8897da39..d398a4db0bdd 100644
--- a/clang/test/3C/fptrunsafeprotocallee.c
+++ b/clang/test/3C/fptrunsafeprotocallee.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/fptrunsafeprotocallee.checked.c -- | count 0
-// RUN: rm %S/fptrunsafeprotocallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafeprotocaller.c b/clang/test/3C/fptrunsafeprotocaller.c
index 340388ba7ef8..4df3cfe43bdf 100644
--- a/clang/test/3C/fptrunsafeprotocaller.c
+++ b/clang/test/3C/fptrunsafeprotocaller.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/fptrunsafeprotocaller.checked.c -- | count 0
-// RUN: rm %S/fptrunsafeprotocaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafeprotosafe.c b/clang/test/3C/fptrunsafeprotosafe.c
index 78be4bd990bc..7f4587e1fbf2 100644
--- a/clang/test/3C/fptrunsafeprotosafe.c
+++ b/clang/test/3C/fptrunsafeprotosafe.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/fptrunsafeprotosafe.checked.c -- | count 0
-// RUN: rm %S/fptrunsafeprotosafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafesafe.c b/clang/test/3C/fptrunsafesafe.c
index 8472c5e6ba3d..e4def5322d6b 100644
--- a/clang/test/3C/fptrunsafesafe.c
+++ b/clang/test/3C/fptrunsafesafe.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/fptrunsafesafe.checked.c -- | count 0
-// RUN: rm %S/fptrunsafesafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafesafemulti1.c b/clang/test/3C/fptrunsafesafemulti1.c
index 0bbd48315747..0ee06cc6bf45 100644
--- a/clang/test/3C/fptrunsafesafemulti1.c
+++ b/clang/test/3C/fptrunsafesafemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/fptrunsafesafemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/fptrunsafesafemulti2.c
-// RUN: %clang -c %S/fptrunsafesafemulti1.checkedNOALL.c %S/fptrunsafesafemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrunsafesafemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrunsafesafemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/fptrunsafesafemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrunsafesafemulti1.checked.c %S/fptrunsafesafemulti2.checked.c
-// RUN: test ! -f %S/fptrunsafesafemulti1.checked.convert_again.c
-// RUN: test ! -f %S/fptrunsafesafemulti2.checked.convert_again.c
-// RUN: rm %S/fptrunsafesafemulti1.checkedALL.c %S/fptrunsafesafemulti2.checkedALL.c
-// RUN: rm %S/fptrunsafesafemulti1.checkedNOALL.c %S/fptrunsafesafemulti2.checkedNOALL.c
-// RUN: rm %S/fptrunsafesafemulti1.checked.c %S/fptrunsafesafemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/fptrunsafesafemulti2.c b/clang/test/3C/fptrunsafesafemulti2.c
index e4d03a249c57..ba91e8f6f4ea 100644
--- a/clang/test/3C/fptrunsafesafemulti2.c
+++ b/clang/test/3C/fptrunsafesafemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/fptrunsafesafemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/fptrunsafesafemulti1.c %s
-// RUN: %clang -c %S/fptrunsafesafemulti1.checkedNOALL2.c %S/fptrunsafesafemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/fptrunsafesafemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/fptrunsafesafemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/fptrunsafesafemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/fptrunsafesafemulti1.checked2.c %S/fptrunsafesafemulti2.checked2.c
-// RUN: test ! -f %S/fptrunsafesafemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/fptrunsafesafemulti2.checked2.convert_again.c
-// RUN: rm %S/fptrunsafesafemulti1.checkedALL2.c %S/fptrunsafesafemulti2.checkedALL2.c
-// RUN: rm %S/fptrunsafesafemulti1.checkedNOALL2.c %S/fptrunsafesafemulti2.checkedNOALL2.c
-// RUN: rm %S/fptrunsafesafemulti1.checked2.c %S/fptrunsafesafemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/funcptr1.c b/clang/test/3C/funcptr1.c
index ebb1cc972443..dcf7cb54d77f 100644
--- a/clang/test/3C/funcptr1.c
+++ b/clang/test/3C/funcptr1.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/funcptr1.checked.c -- | count 0
-// RUN: rm %S/funcptr1.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 void f(int *(*fp)(int *)) {
 	//CHECK: void f(_Ptr<int * (int *)> fp) {
diff --git a/clang/test/3C/funcptr2.c b/clang/test/3C/funcptr2.c
index e9718e08330a..3c718c52466b 100644
--- a/clang/test/3C/funcptr2.c
+++ b/clang/test/3C/funcptr2.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/funcptr2.checked.c -- | count 0
-// RUN: rm %S/funcptr2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 void f(int *(*fp)(int *)) {
 	//CHECK: void f(_Ptr<int * (int *)> fp) {
diff --git a/clang/test/3C/funcptr3.c b/clang/test/3C/funcptr3.c
index 3bf524e0166e..546d0ec189c9 100644
--- a/clang/test/3C/funcptr3.c
+++ b/clang/test/3C/funcptr3.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/funcptr3.checked.c -- | count 0
-// RUN: rm %S/funcptr3.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 void f(int *(*fp)(int *)) {
 	//CHECK: void f(_Ptr<int * (int *)> fp) {
diff --git a/clang/test/3C/funcptr4.c b/clang/test/3C/funcptr4.c
index cec68448a6f1..1566210804fd 100644
--- a/clang/test/3C/funcptr4.c
+++ b/clang/test/3C/funcptr4.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/funcptr4.checked.c -- | count 0
-// RUN: rm %S/funcptr4.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 void f(int *(*fp)(int *)) {
 	//CHECK: void f(_Ptr<_Ptr<int> (_Ptr<int> )> fp) _Checked {
diff --git a/clang/test/3C/graphs.c b/clang/test/3C/graphs.c
index 84652ddcfc7c..83adac13c69b 100644
--- a/clang/test/3C/graphs.c
+++ b/clang/test/3C/graphs.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/graphs.checked.c -- | count 0
-// RUN: rm %S/graphs.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-diff-w %s -t %t --clang '%clang'
 
 #include <stdio.h>
 
diff --git a/clang/test/3C/graphs2.c b/clang/test/3C/graphs2.c
index 6c342052d8dc..bb9294da96a3 100644
--- a/clang/test/3C/graphs2.c
+++ b/clang/test/3C/graphs2.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/graphs2.checked.c -- | count 0
-// RUN: rm %S/graphs2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 #include<stdio.h>
 
diff --git a/clang/test/3C/gvar.c b/clang/test/3C/gvar.c
index fb7d5bc2a7a0..8e3b8dd65d7b 100644
--- a/clang/test/3C/gvar.c
+++ b/clang/test/3C/gvar.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/gvar.checked.c -- | count 0
-// RUN: rm %S/gvar.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 int *x;
 	//CHECK: _Ptr<int> x = ((void *)0);
diff --git a/clang/test/3C/i1.c b/clang/test/3C/i1.c
index 6b8099d467b0..ad422981123a 100644
--- a/clang/test/3C/i1.c
+++ b/clang/test/3C/i1.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/i1.checked.c -- | count 0
-// RUN: rm %S/i1.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 /*nothing in this file, save the trivially converted w, should be converted*/
 int *foo(int *w) {
diff --git a/clang/test/3C/i2.c b/clang/test/3C/i2.c
index c6cfdb23bc38..84c039de70bb 100644
--- a/clang/test/3C/i2.c
+++ b/clang/test/3C/i2.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/i2.checked.c -- | count 0
-// RUN: rm %S/i2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 static int *f(int *x) {
 	//CHECK: static _Ptr<int> f(_Ptr<int> x) _Checked {
diff --git a/clang/test/3C/i3.c b/clang/test/3C/i3.c
index 5e186bef5896..6b577e55a69c 100644
--- a/clang/test/3C/i3.c
+++ b/clang/test/3C/i3.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/i3.checked.c -- | count 0
-// RUN: rm %S/i3.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 static int * f(int *x) {
 	//CHECK: static int * f(int *x) {
diff --git a/clang/test/3C/linkedlist.c b/clang/test/3C/linkedlist.c
index 31c642281aa7..010ca0012551 100644
--- a/clang/test/3C/linkedlist.c
+++ b/clang/test/3C/linkedlist.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/linkedlist.checked.c -- | count 0
-// RUN: rm %S/linkedlist.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 #include <stdio.h>
 
diff --git a/clang/test/3C/malloc_array.c b/clang/test/3C/malloc_array.c
index 32b54423b15b..656996fd9498 100644
--- a/clang/test/3C/malloc_array.c
+++ b/clang/test/3C/malloc_array.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/malloc_array.checked.c -- | count 0
-// RUN: rm %S/malloc_array.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 #include <stddef.h>
 extern _Itype_for_any(T) void *malloc(size_t size) : itype(_Array_ptr<T>) byte_count(size);
diff --git a/clang/test/3C/ptrTOptrboth.c b/clang/test/3C/ptrTOptrboth.c
index 54bcc70e15cc..26e4e063ff3e 100644
--- a/clang/test/3C/ptrTOptrboth.c
+++ b/clang/test/3C/ptrTOptrboth.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/ptrTOptrboth.checked.c -- | count 0
-// RUN: rm %S/ptrTOptrboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrbothmulti1.c b/clang/test/3C/ptrTOptrbothmulti1.c
index d7ba585ba1a5..29b62315159a 100644
--- a/clang/test/3C/ptrTOptrbothmulti1.c
+++ b/clang/test/3C/ptrTOptrbothmulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/ptrTOptrbothmulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/ptrTOptrbothmulti2.c
-// RUN: %clang -c %S/ptrTOptrbothmulti1.checkedNOALL.c %S/ptrTOptrbothmulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/ptrTOptrbothmulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/ptrTOptrbothmulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/ptrTOptrbothmulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/ptrTOptrbothmulti1.checked.c %S/ptrTOptrbothmulti2.checked.c
-// RUN: test ! -f %S/ptrTOptrbothmulti1.checked.convert_again.c
-// RUN: test ! -f %S/ptrTOptrbothmulti2.checked.convert_again.c
-// RUN: rm %S/ptrTOptrbothmulti1.checkedALL.c %S/ptrTOptrbothmulti2.checkedALL.c
-// RUN: rm %S/ptrTOptrbothmulti1.checkedNOALL.c %S/ptrTOptrbothmulti2.checkedNOALL.c
-// RUN: rm %S/ptrTOptrbothmulti1.checked.c %S/ptrTOptrbothmulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrbothmulti2.c b/clang/test/3C/ptrTOptrbothmulti2.c
index 6b31a7509b7f..d5d4993b7144 100644
--- a/clang/test/3C/ptrTOptrbothmulti2.c
+++ b/clang/test/3C/ptrTOptrbothmulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/ptrTOptrbothmulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/ptrTOptrbothmulti1.c %s
-// RUN: %clang -c %S/ptrTOptrbothmulti1.checkedNOALL2.c %S/ptrTOptrbothmulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/ptrTOptrbothmulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/ptrTOptrbothmulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/ptrTOptrbothmulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/ptrTOptrbothmulti1.checked2.c %S/ptrTOptrbothmulti2.checked2.c
-// RUN: test ! -f %S/ptrTOptrbothmulti1.checked2.convert_again.c
-// RUN: test ! -f %S/ptrTOptrbothmulti2.checked2.convert_again.c
-// RUN: rm %S/ptrTOptrbothmulti1.checkedALL2.c %S/ptrTOptrbothmulti2.checkedALL2.c
-// RUN: rm %S/ptrTOptrbothmulti1.checkedNOALL2.c %S/ptrTOptrbothmulti2.checkedNOALL2.c
-// RUN: rm %S/ptrTOptrbothmulti1.checked2.c %S/ptrTOptrbothmulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrcallee.c b/clang/test/3C/ptrTOptrcallee.c
index 3d8053a7fd13..ecb009e9cbb2 100644
--- a/clang/test/3C/ptrTOptrcallee.c
+++ b/clang/test/3C/ptrTOptrcallee.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/ptrTOptrcallee.checked.c -- | count 0
-// RUN: rm %S/ptrTOptrcallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrcalleemulti1.c b/clang/test/3C/ptrTOptrcalleemulti1.c
index 5b65b99e7f0a..d9b0a5fb36fd 100644
--- a/clang/test/3C/ptrTOptrcalleemulti1.c
+++ b/clang/test/3C/ptrTOptrcalleemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/ptrTOptrcalleemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/ptrTOptrcalleemulti2.c
-// RUN: %clang -c %S/ptrTOptrcalleemulti1.checkedNOALL.c %S/ptrTOptrcalleemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/ptrTOptrcalleemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/ptrTOptrcalleemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/ptrTOptrcalleemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/ptrTOptrcalleemulti1.checked.c %S/ptrTOptrcalleemulti2.checked.c
-// RUN: test ! -f %S/ptrTOptrcalleemulti1.checked.convert_again.c
-// RUN: test ! -f %S/ptrTOptrcalleemulti2.checked.convert_again.c
-// RUN: rm %S/ptrTOptrcalleemulti1.checkedALL.c %S/ptrTOptrcalleemulti2.checkedALL.c
-// RUN: rm %S/ptrTOptrcalleemulti1.checkedNOALL.c %S/ptrTOptrcalleemulti2.checkedNOALL.c
-// RUN: rm %S/ptrTOptrcalleemulti1.checked.c %S/ptrTOptrcalleemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrcalleemulti2.c b/clang/test/3C/ptrTOptrcalleemulti2.c
index 1308208a5063..eeb73ee73f67 100644
--- a/clang/test/3C/ptrTOptrcalleemulti2.c
+++ b/clang/test/3C/ptrTOptrcalleemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/ptrTOptrcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/ptrTOptrcalleemulti1.c %s
-// RUN: %clang -c %S/ptrTOptrcalleemulti1.checkedNOALL2.c %S/ptrTOptrcalleemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/ptrTOptrcalleemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/ptrTOptrcalleemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/ptrTOptrcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/ptrTOptrcalleemulti1.checked2.c %S/ptrTOptrcalleemulti2.checked2.c
-// RUN: test ! -f %S/ptrTOptrcalleemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/ptrTOptrcalleemulti2.checked2.convert_again.c
-// RUN: rm %S/ptrTOptrcalleemulti1.checkedALL2.c %S/ptrTOptrcalleemulti2.checkedALL2.c
-// RUN: rm %S/ptrTOptrcalleemulti1.checkedNOALL2.c %S/ptrTOptrcalleemulti2.checkedNOALL2.c
-// RUN: rm %S/ptrTOptrcalleemulti1.checked2.c %S/ptrTOptrcalleemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrcaller.c b/clang/test/3C/ptrTOptrcaller.c
index 1ed13c7a0d46..2a9ceb73d00d 100644
--- a/clang/test/3C/ptrTOptrcaller.c
+++ b/clang/test/3C/ptrTOptrcaller.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/ptrTOptrcaller.checked.c -- | count 0
-// RUN: rm %S/ptrTOptrcaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrcallermulti1.c b/clang/test/3C/ptrTOptrcallermulti1.c
index 8999dc27e44c..37ccbd45e0b8 100644
--- a/clang/test/3C/ptrTOptrcallermulti1.c
+++ b/clang/test/3C/ptrTOptrcallermulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/ptrTOptrcallermulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/ptrTOptrcallermulti2.c
-// RUN: %clang -c %S/ptrTOptrcallermulti1.checkedNOALL.c %S/ptrTOptrcallermulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/ptrTOptrcallermulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/ptrTOptrcallermulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/ptrTOptrcallermulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/ptrTOptrcallermulti1.checked.c %S/ptrTOptrcallermulti2.checked.c
-// RUN: test ! -f %S/ptrTOptrcallermulti1.checked.convert_again.c
-// RUN: test ! -f %S/ptrTOptrcallermulti2.checked.convert_again.c
-// RUN: rm %S/ptrTOptrcallermulti1.checkedALL.c %S/ptrTOptrcallermulti2.checkedALL.c
-// RUN: rm %S/ptrTOptrcallermulti1.checkedNOALL.c %S/ptrTOptrcallermulti2.checkedNOALL.c
-// RUN: rm %S/ptrTOptrcallermulti1.checked.c %S/ptrTOptrcallermulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrcallermulti2.c b/clang/test/3C/ptrTOptrcallermulti2.c
index ab9c42350dbf..6ab1bcc7d3fd 100644
--- a/clang/test/3C/ptrTOptrcallermulti2.c
+++ b/clang/test/3C/ptrTOptrcallermulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/ptrTOptrcallermulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/ptrTOptrcallermulti1.c %s
-// RUN: %clang -c %S/ptrTOptrcallermulti1.checkedNOALL2.c %S/ptrTOptrcallermulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/ptrTOptrcallermulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/ptrTOptrcallermulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/ptrTOptrcallermulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/ptrTOptrcallermulti1.checked2.c %S/ptrTOptrcallermulti2.checked2.c
-// RUN: test ! -f %S/ptrTOptrcallermulti1.checked2.convert_again.c
-// RUN: test ! -f %S/ptrTOptrcallermulti2.checked2.convert_again.c
-// RUN: rm %S/ptrTOptrcallermulti1.checkedALL2.c %S/ptrTOptrcallermulti2.checkedALL2.c
-// RUN: rm %S/ptrTOptrcallermulti1.checkedNOALL2.c %S/ptrTOptrcallermulti2.checkedNOALL2.c
-// RUN: rm %S/ptrTOptrcallermulti1.checked2.c %S/ptrTOptrcallermulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrprotoboth.c b/clang/test/3C/ptrTOptrprotoboth.c
index 043ed29f22b3..ac1df1ad8c23 100644
--- a/clang/test/3C/ptrTOptrprotoboth.c
+++ b/clang/test/3C/ptrTOptrprotoboth.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/ptrTOptrprotoboth.checked.c -- | count 0
-// RUN: rm %S/ptrTOptrprotoboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrprotocallee.c b/clang/test/3C/ptrTOptrprotocallee.c
index f8974dd6d620..89f7f7d514b1 100644
--- a/clang/test/3C/ptrTOptrprotocallee.c
+++ b/clang/test/3C/ptrTOptrprotocallee.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/ptrTOptrprotocallee.checked.c -- | count 0
-// RUN: rm %S/ptrTOptrprotocallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrprotocaller.c b/clang/test/3C/ptrTOptrprotocaller.c
index fe2d931d9d42..126ed3f562a3 100644
--- a/clang/test/3C/ptrTOptrprotocaller.c
+++ b/clang/test/3C/ptrTOptrprotocaller.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/ptrTOptrprotocaller.checked.c -- | count 0
-// RUN: rm %S/ptrTOptrprotocaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrprotosafe.c b/clang/test/3C/ptrTOptrprotosafe.c
index c4b12f19b83e..8a183fda6506 100644
--- a/clang/test/3C/ptrTOptrprotosafe.c
+++ b/clang/test/3C/ptrTOptrprotosafe.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/ptrTOptrprotosafe.checked.c -- | count 0
-// RUN: rm %S/ptrTOptrprotosafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrsafe.c b/clang/test/3C/ptrTOptrsafe.c
index 2ce04301afd2..922cb8a2c6ae 100644
--- a/clang/test/3C/ptrTOptrsafe.c
+++ b/clang/test/3C/ptrTOptrsafe.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/ptrTOptrsafe.checked.c -- | count 0
-// RUN: rm %S/ptrTOptrsafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrsafemulti1.c b/clang/test/3C/ptrTOptrsafemulti1.c
index 2906d4952fd4..7c6ae55f51c3 100644
--- a/clang/test/3C/ptrTOptrsafemulti1.c
+++ b/clang/test/3C/ptrTOptrsafemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/ptrTOptrsafemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/ptrTOptrsafemulti2.c
-// RUN: %clang -c %S/ptrTOptrsafemulti1.checkedNOALL.c %S/ptrTOptrsafemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/ptrTOptrsafemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/ptrTOptrsafemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/ptrTOptrsafemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/ptrTOptrsafemulti1.checked.c %S/ptrTOptrsafemulti2.checked.c
-// RUN: test ! -f %S/ptrTOptrsafemulti1.checked.convert_again.c
-// RUN: test ! -f %S/ptrTOptrsafemulti2.checked.convert_again.c
-// RUN: rm %S/ptrTOptrsafemulti1.checkedALL.c %S/ptrTOptrsafemulti2.checkedALL.c
-// RUN: rm %S/ptrTOptrsafemulti1.checkedNOALL.c %S/ptrTOptrsafemulti2.checkedNOALL.c
-// RUN: rm %S/ptrTOptrsafemulti1.checked.c %S/ptrTOptrsafemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptrTOptrsafemulti2.c b/clang/test/3C/ptrTOptrsafemulti2.c
index cb232c882f16..b54fa11a028c 100644
--- a/clang/test/3C/ptrTOptrsafemulti2.c
+++ b/clang/test/3C/ptrTOptrsafemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/ptrTOptrsafemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/ptrTOptrsafemulti1.c %s
-// RUN: %clang -c %S/ptrTOptrsafemulti1.checkedNOALL2.c %S/ptrTOptrsafemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/ptrTOptrsafemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/ptrTOptrsafemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/ptrTOptrsafemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/ptrTOptrsafemulti1.checked2.c %S/ptrTOptrsafemulti2.checked2.c
-// RUN: test ! -f %S/ptrTOptrsafemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/ptrTOptrsafemulti2.checked2.convert_again.c
-// RUN: rm %S/ptrTOptrsafemulti1.checkedALL2.c %S/ptrTOptrsafemulti2.checkedALL2.c
-// RUN: rm %S/ptrTOptrsafemulti1.checkedNOALL2.c %S/ptrTOptrsafemulti2.checkedNOALL2.c
-// RUN: rm %S/ptrTOptrsafemulti1.checked2.c %S/ptrTOptrsafemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/ptr_array.c b/clang/test/3C/ptr_array.c
index 736a1094d14c..ef4a696143c5 100644
--- a/clang/test/3C/ptr_array.c
+++ b/clang/test/3C/ptr_array.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/ptr_array.checked.c -- | count 0
-// RUN: rm %S/ptr_array.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-diff-w %s -t %t --clang '%clang'
 
 /* Tests for issue 60. Array initialization had not been implemented, so wild
  pointer inside and array initializer did not cause the array to be an array
diff --git a/clang/test/3C/ptrptr.c b/clang/test/3C/ptrptr.c
index a385c137034a..2b6eb3923f69 100644
--- a/clang/test/3C/ptrptr.c
+++ b/clang/test/3C/ptrptr.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/ptrptr.checked.c -- | count 0
-// RUN: rm %S/ptrptr.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-diff-w %s -t %t --clang '%clang'
 
 #include <stddef.h>
 #include <stddef.h>
diff --git a/clang/test/3C/realloc.c b/clang/test/3C/realloc.c
index 37b7c9ac52f2..6a5cd9927e52 100644
--- a/clang/test/3C/realloc.c
+++ b/clang/test/3C/realloc.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/realloc.checked.c -- | count 0
-// RUN: rm %S/realloc.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 
 #include <stddef.h>
diff --git a/clang/test/3C/realloc_complex.c b/clang/test/3C/realloc_complex.c
index f0ca3fcda086..26949e60ca4e 100644
--- a/clang/test/3C/realloc_complex.c
+++ b/clang/test/3C/realloc_complex.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/realloc_complex.checked.c -- | count 0
-// RUN: rm %S/realloc_complex.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 /**********************************************************/
 /* This file tests the conversion tool's behavior with    */
diff --git a/clang/test/3C/refarrsubscript.c b/clang/test/3C/refarrsubscript.c
index 7094f4407db4..d8a095ac5452 100644
--- a/clang/test/3C/refarrsubscript.c
+++ b/clang/test/3C/refarrsubscript.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/refarrsubscript.checked.c -- | count 0
-// RUN: rm %S/refarrsubscript.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 int **func(int **p, int *x) {
 	//CHECK_NOALL: int **func(int **p, _Ptr<int> x) {
diff --git a/clang/test/3C/return_not_least.c b/clang/test/3C/return_not_least.c
index fd5d4f6a09cd..e027cc8db71d 100644
--- a/clang/test/3C/return_not_least.c
+++ b/clang/test/3C/return_not_least.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/return_not_least.checked.c -- | count 0
-// RUN: rm %S/return_not_least.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 int *a() {
 	//CHECK_NOALL: int *a(void) {
diff --git a/clang/test/3C/safefptrargboth.c b/clang/test/3C/safefptrargboth.c
index d2f85f29501d..e61b625b49a5 100644
--- a/clang/test/3C/safefptrargboth.c
+++ b/clang/test/3C/safefptrargboth.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/safefptrargboth.checked.c -- | count 0
-// RUN: rm %S/safefptrargboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargbothmulti1.c b/clang/test/3C/safefptrargbothmulti1.c
index e23be0637f3e..7b767e06be9b 100644
--- a/clang/test/3C/safefptrargbothmulti1.c
+++ b/clang/test/3C/safefptrargbothmulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/safefptrargbothmulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/safefptrargbothmulti2.c
-// RUN: %clang -c %S/safefptrargbothmulti1.checkedNOALL.c %S/safefptrargbothmulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/safefptrargbothmulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/safefptrargbothmulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/safefptrargbothmulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/safefptrargbothmulti1.checked.c %S/safefptrargbothmulti2.checked.c
-// RUN: test ! -f %S/safefptrargbothmulti1.checked.convert_again.c
-// RUN: test ! -f %S/safefptrargbothmulti2.checked.convert_again.c
-// RUN: rm %S/safefptrargbothmulti1.checkedALL.c %S/safefptrargbothmulti2.checkedALL.c
-// RUN: rm %S/safefptrargbothmulti1.checkedNOALL.c %S/safefptrargbothmulti2.checkedNOALL.c
-// RUN: rm %S/safefptrargbothmulti1.checked.c %S/safefptrargbothmulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargbothmulti2.c b/clang/test/3C/safefptrargbothmulti2.c
index fbd33a3f7d95..bb89c8c34359 100644
--- a/clang/test/3C/safefptrargbothmulti2.c
+++ b/clang/test/3C/safefptrargbothmulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/safefptrargbothmulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/safefptrargbothmulti1.c %s
-// RUN: %clang -c %S/safefptrargbothmulti1.checkedNOALL2.c %S/safefptrargbothmulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/safefptrargbothmulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/safefptrargbothmulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/safefptrargbothmulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/safefptrargbothmulti1.checked2.c %S/safefptrargbothmulti2.checked2.c
-// RUN: test ! -f %S/safefptrargbothmulti1.checked2.convert_again.c
-// RUN: test ! -f %S/safefptrargbothmulti2.checked2.convert_again.c
-// RUN: rm %S/safefptrargbothmulti1.checkedALL2.c %S/safefptrargbothmulti2.checkedALL2.c
-// RUN: rm %S/safefptrargbothmulti1.checkedNOALL2.c %S/safefptrargbothmulti2.checkedNOALL2.c
-// RUN: rm %S/safefptrargbothmulti1.checked2.c %S/safefptrargbothmulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargcallee.c b/clang/test/3C/safefptrargcallee.c
index 767503bd8742..4c46e321c404 100644
--- a/clang/test/3C/safefptrargcallee.c
+++ b/clang/test/3C/safefptrargcallee.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/safefptrargcallee.checked.c -- | count 0
-// RUN: rm %S/safefptrargcallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargcalleemulti1.c b/clang/test/3C/safefptrargcalleemulti1.c
index fe8e7c0ac2f1..6e39858ea67c 100644
--- a/clang/test/3C/safefptrargcalleemulti1.c
+++ b/clang/test/3C/safefptrargcalleemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/safefptrargcalleemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/safefptrargcalleemulti2.c
-// RUN: %clang -c %S/safefptrargcalleemulti1.checkedNOALL.c %S/safefptrargcalleemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/safefptrargcalleemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/safefptrargcalleemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/safefptrargcalleemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/safefptrargcalleemulti1.checked.c %S/safefptrargcalleemulti2.checked.c
-// RUN: test ! -f %S/safefptrargcalleemulti1.checked.convert_again.c
-// RUN: test ! -f %S/safefptrargcalleemulti2.checked.convert_again.c
-// RUN: rm %S/safefptrargcalleemulti1.checkedALL.c %S/safefptrargcalleemulti2.checkedALL.c
-// RUN: rm %S/safefptrargcalleemulti1.checkedNOALL.c %S/safefptrargcalleemulti2.checkedNOALL.c
-// RUN: rm %S/safefptrargcalleemulti1.checked.c %S/safefptrargcalleemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargcalleemulti2.c b/clang/test/3C/safefptrargcalleemulti2.c
index 661dd710ea57..fcf47d032218 100644
--- a/clang/test/3C/safefptrargcalleemulti2.c
+++ b/clang/test/3C/safefptrargcalleemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/safefptrargcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/safefptrargcalleemulti1.c %s
-// RUN: %clang -c %S/safefptrargcalleemulti1.checkedNOALL2.c %S/safefptrargcalleemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/safefptrargcalleemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/safefptrargcalleemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/safefptrargcalleemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/safefptrargcalleemulti1.checked2.c %S/safefptrargcalleemulti2.checked2.c
-// RUN: test ! -f %S/safefptrargcalleemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/safefptrargcalleemulti2.checked2.convert_again.c
-// RUN: rm %S/safefptrargcalleemulti1.checkedALL2.c %S/safefptrargcalleemulti2.checkedALL2.c
-// RUN: rm %S/safefptrargcalleemulti1.checkedNOALL2.c %S/safefptrargcalleemulti2.checkedNOALL2.c
-// RUN: rm %S/safefptrargcalleemulti1.checked2.c %S/safefptrargcalleemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargcaller.c b/clang/test/3C/safefptrargcaller.c
index 98c7424b2d34..e485872397e9 100644
--- a/clang/test/3C/safefptrargcaller.c
+++ b/clang/test/3C/safefptrargcaller.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/safefptrargcaller.checked.c -- | count 0
-// RUN: rm %S/safefptrargcaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargcallermulti1.c b/clang/test/3C/safefptrargcallermulti1.c
index 8fad1fc93396..3c27fd60599c 100644
--- a/clang/test/3C/safefptrargcallermulti1.c
+++ b/clang/test/3C/safefptrargcallermulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/safefptrargcallermulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/safefptrargcallermulti2.c
-// RUN: %clang -c %S/safefptrargcallermulti1.checkedNOALL.c %S/safefptrargcallermulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/safefptrargcallermulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/safefptrargcallermulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/safefptrargcallermulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/safefptrargcallermulti1.checked.c %S/safefptrargcallermulti2.checked.c
-// RUN: test ! -f %S/safefptrargcallermulti1.checked.convert_again.c
-// RUN: test ! -f %S/safefptrargcallermulti2.checked.convert_again.c
-// RUN: rm %S/safefptrargcallermulti1.checkedALL.c %S/safefptrargcallermulti2.checkedALL.c
-// RUN: rm %S/safefptrargcallermulti1.checkedNOALL.c %S/safefptrargcallermulti2.checkedNOALL.c
-// RUN: rm %S/safefptrargcallermulti1.checked.c %S/safefptrargcallermulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargcallermulti2.c b/clang/test/3C/safefptrargcallermulti2.c
index ccbc42cbf1a5..38904df466ab 100644
--- a/clang/test/3C/safefptrargcallermulti2.c
+++ b/clang/test/3C/safefptrargcallermulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/safefptrargcallermulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/safefptrargcallermulti1.c %s
-// RUN: %clang -c %S/safefptrargcallermulti1.checkedNOALL2.c %S/safefptrargcallermulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/safefptrargcallermulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/safefptrargcallermulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/safefptrargcallermulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/safefptrargcallermulti1.checked2.c %S/safefptrargcallermulti2.checked2.c
-// RUN: test ! -f %S/safefptrargcallermulti1.checked2.convert_again.c
-// RUN: test ! -f %S/safefptrargcallermulti2.checked2.convert_again.c
-// RUN: rm %S/safefptrargcallermulti1.checkedALL2.c %S/safefptrargcallermulti2.checkedALL2.c
-// RUN: rm %S/safefptrargcallermulti1.checkedNOALL2.c %S/safefptrargcallermulti2.checkedNOALL2.c
-// RUN: rm %S/safefptrargcallermulti1.checked2.c %S/safefptrargcallermulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargprotoboth.c b/clang/test/3C/safefptrargprotoboth.c
index 2da99dc6b7a8..1d6a3ab2a4ba 100644
--- a/clang/test/3C/safefptrargprotoboth.c
+++ b/clang/test/3C/safefptrargprotoboth.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/safefptrargprotoboth.checked.c -- | count 0
-// RUN: rm %S/safefptrargprotoboth.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargprotocallee.c b/clang/test/3C/safefptrargprotocallee.c
index 2db879c6d0e1..8ce151a0300b 100644
--- a/clang/test/3C/safefptrargprotocallee.c
+++ b/clang/test/3C/safefptrargprotocallee.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/safefptrargprotocallee.checked.c -- | count 0
-// RUN: rm %S/safefptrargprotocallee.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargprotocaller.c b/clang/test/3C/safefptrargprotocaller.c
index 872ce17148a5..78c465da7228 100644
--- a/clang/test/3C/safefptrargprotocaller.c
+++ b/clang/test/3C/safefptrargprotocaller.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/safefptrargprotocaller.checked.c -- | count 0
-// RUN: rm %S/safefptrargprotocaller.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargprotosafe.c b/clang/test/3C/safefptrargprotosafe.c
index ae425526c483..6e9976a85ac8 100644
--- a/clang/test/3C/safefptrargprotosafe.c
+++ b/clang/test/3C/safefptrargprotosafe.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/safefptrargprotosafe.checked.c -- | count 0
-// RUN: rm %S/safefptrargprotosafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargsafe.c b/clang/test/3C/safefptrargsafe.c
index d9dbe5d31360..be7066533183 100644
--- a/clang/test/3C/safefptrargsafe.c
+++ b/clang/test/3C/safefptrargsafe.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/safefptrargsafe.checked.c -- | count 0
-// RUN: rm %S/safefptrargsafe.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common-testgenerator %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargsafemulti1.c b/clang/test/3C/safefptrargsafemulti1.c
index 8ad616a6c67d..a1069dd37ecb 100644
--- a/clang/test/3C/safefptrargsafemulti1.c
+++ b/clang/test/3C/safefptrargsafemulti1.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL %s %S/safefptrargsafemulti2.c
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL %s %S/safefptrargsafemulti2.c
-// RUN: %clang -c %S/safefptrargsafemulti1.checkedNOALL.c %S/safefptrargsafemulti2.checkedNOALL.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/safefptrargsafemulti1.checkedNOALL.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/safefptrargsafemulti1.checkedALL.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked %S/safefptrargsafemulti2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/safefptrargsafemulti1.checked.c %S/safefptrargsafemulti2.checked.c
-// RUN: test ! -f %S/safefptrargsafemulti1.checked.convert_again.c
-// RUN: test ! -f %S/safefptrargsafemulti2.checked.convert_again.c
-// RUN: rm %S/safefptrargsafemulti1.checkedALL.c %S/safefptrargsafemulti2.checkedALL.c
-// RUN: rm %S/safefptrargsafemulti1.checkedNOALL.c %S/safefptrargsafemulti2.checkedNOALL.c
-// RUN: rm %S/safefptrargsafemulti1.checked.c %S/safefptrargsafemulti2.checked.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/safefptrargsafemulti2.c b/clang/test/3C/safefptrargsafemulti2.c
index a4aee342adc6..a6179bcb66f2 100644
--- a/clang/test/3C/safefptrargsafemulti2.c
+++ b/clang/test/3C/safefptrargsafemulti2.c
@@ -1,15 +1,4 @@
-// RUN: 3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL2 %S/safefptrargsafemulti1.c %s
-// RUN: 3c -base-dir=%S -addcr -output-postfix=checkedNOALL2 %S/safefptrargsafemulti1.c %s
-// RUN: %clang -c %S/safefptrargsafemulti1.checkedNOALL2.c %S/safefptrargsafemulti2.checkedNOALL2.c
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/safefptrargsafemulti2.checkedNOALL2.c %s
-// RUN: FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/safefptrargsafemulti2.checkedALL2.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=checked2 %S/safefptrargsafemulti1.c %s
-// RUN: 3c -base-dir=%S -alltypes -output-postfix=convert_again %S/safefptrargsafemulti1.checked2.c %S/safefptrargsafemulti2.checked2.c
-// RUN: test ! -f %S/safefptrargsafemulti1.checked2.convert_again.c
-// RUN: test ! -f %S/safefptrargsafemulti2.checked2.convert_again.c
-// RUN: rm %S/safefptrargsafemulti1.checkedALL2.c %S/safefptrargsafemulti2.checkedALL2.c
-// RUN: rm %S/safefptrargsafemulti1.checkedNOALL2.c %S/safefptrargsafemulti2.checkedNOALL2.c
-// RUN: rm %S/safefptrargsafemulti1.checked2.c %S/safefptrargsafemulti2.checked2.c
+// RUN: %S/3c-regtest.py --predefined-script multi %s -t %t --clang '%clang'
 
 
 /*********************************************************************************/
diff --git a/clang/test/3C/script_generator.py b/clang/test/3C/script_generator.py
index 96eb24c5defe..9f1c7f63e172 100644
--- a/clang/test/3C/script_generator.py
+++ b/clang/test/3C/script_generator.py
@@ -9,6 +9,71 @@
 def remove_suffix(string, suffix):
     return string[:-len(suffix)] if string.endswith(suffix) else None
 
+# Right now, our focus is on exactly reproducing the existing RUN scripts to
+# verify the conversion. Obviously, we eventually want to remove the cruft and
+# add new features. TBD whether we complete the verification first and then
+# change the scripts here or we maintain old scripts (for reproduction) and new
+# scripts (for running tests) here in parallel for some period of time.
+
+# Unlike all the other % codes that are substituted by `lit`, %B is a special
+# code that generate_script (below) replaces with the basename of the test file
+# without the `.c` extension. This reproduces some of the scripts in existing
+# test files.
+common_script = '''\
+3c -alltypes -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" %s
+3c -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" %s
+3c -addcr %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
+3c -output-postfix=checked -alltypes %s
+3c -alltypes %S/%B.checked.c -- | %COMPARISON
+rm %S/%B.checked.c
+'''
+
+# As per https://github.com/correctcomputation/checkedc-clang/issues/328, the
+# `count 0` may be replaced with `diff -w %S/%B.checked.c -` in the future.
+common_script_no_diff = common_script.replace('%COMPARISON', 'count 0')
+
+# I guess the important part here is the `-w` to work around the rewriter not
+# exactly preserving whitespace?
+common_script_diff_w = common_script.replace('%COMPARISON', 'diff -w %S/%B.checked.c -')
+
+# Equivalent variant of common_script_no_diff seen in testgenerator.py.
+common_script_testgenerator = '''\
+3c -alltypes -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" %s
+3c -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" %s
+3c -addcr %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
+
+3c -alltypes -output-postfix=checked %s
+3c -alltypes %S/%B.checked.c -- | count 0
+rm %S/%B.checked.c
+'''
+
+# Additional codes substituted in generate_script:
+# - %M: %B with a trailing `1` or `2` removed
+# - %O ("other"): %B with a trailing `1` replaced with `2` or vice versa
+# - %F{1,2}: %s if the digit matches the test filename, %S/%O otherwise
+# - %2: `2` in a multi2 input file, otherwise empty string
+multi_script='''\
+3c -base-dir=%S -addcr -alltypes -output-postfix=checkedALL%2 %F1 %F2
+3c -base-dir=%S -addcr -output-postfix=checkedNOALL%2 %F1 %F2
+%clang -c %S/%M1.checkedNOALL%2.c %S/%M2.checkedNOALL%2.c
+FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" --input-file %S/%B.checkedNOALL%2.c %s
+FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" --input-file %S/%B.checkedALL%2.c %s
+3c -base-dir=%S -alltypes -output-postfix=checked%2 %S/%O.c %s
+3c -base-dir=%S -alltypes -output-postfix=convert_again %S/%M1.checked%2.c %S/%M2.checked%2.c
+test ! -f %S/%M1.checked%2.convert_again.c
+test ! -f %S/%M2.checked%2.convert_again.c
+rm %S/%M1.checkedALL%2.c %S/%M2.checkedALL%2.c
+rm %S/%M1.checkedNOALL%2.c %S/%M2.checkedNOALL%2.c
+rm %S/%M1.checked%2.c %S/%M2.checked%2.c
+'''
+
+predefined_scripts = {
+    'common': common_script_no_diff,
+    'common-diff-w': common_script_diff_w,
+    'common-testgenerator': common_script_testgenerator,
+    'multi': multi_script
+}
+
 parser = argparse.ArgumentParser(
     # This will be shown as if it is a program name runnable by the user. It
     # isn't, but give the user a clue what this argument parser represents.
@@ -23,31 +88,41 @@ def remove_suffix(string, suffix):
 # Future: Redesign in terms of kinds of testing rather than merely selecting one
 # of the existing 5 scripts of the test updating programs.
 parser.add_argument('--predefined-script', required=True,
-                    choices=['processor'])
-
-# Unlike all the other % codes that are substituted by `lit`, %B is a special
-# code that generate_script (below) replaces with the basename of the test file
-# without the `.c` extension. This reproduces some of the scripts in existing
-# test files.
-predefined_scripts = {
-    'processor': '''\
-3c -alltypes -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_ALL","CHECK" %s
-3c -addcr %s -- | FileCheck -match-full-lines -check-prefixes="CHECK_NOALL","CHECK" %s
-3c -addcr %s -- | %clang -c -fcheckedc-extension -x c -o /dev/null -
-3c -output-postfix=checked -alltypes %s
-3c -alltypes %S/%B.checked.c -- | count 0
-rm %S/%B.checked.c
-''',
-}
+                    choices=list(predefined_scripts.keys()))
 
 # `argobj` should be an argument object returned by `parser` or a parser based
 # on it. Returns a list of command strings.
 def generate_commands(argobj):
     test_file = argobj.test_file
+    predefined_script_name = argobj.predefined_script
+
     # FUTURE: If this assumption is no longer valid, update this code.
     test_file_basename_without_ext = remove_suffix(os.path.basename(test_file), '.c')
     if test_file_basename_without_ext is None:
         sys.exit('Test filename does not end in `.c`.')
-    script = remove_suffix(predefined_scripts[argobj.predefined_script], '\n')
-    script = re.sub('%B', test_file_basename_without_ext, script)
+    script = remove_suffix(predefined_scripts[predefined_script_name], '\n')
+    script = script.replace('%B', test_file_basename_without_ext)
+
+    if predefined_script_name == 'multi':
+        last = test_file_basename_without_ext[-1:]
+        multi_base = test_file_basename_without_ext[:-1]
+        if last == '1':
+            multi_other = multi_base + '2'
+            f1 = '%s'
+            f2 = '%S/%O.c'
+            p2 = ''
+        elif last == '2':
+            multi_other = multi_base + '1'
+            f1 = '%S/%O.c'
+            f2 = '%s'
+            p2 = '2'
+        else:
+            sys.exit('--predefined-script is multi, '
+                     'but test filename does not end in `1.c` or `2.c`.')
+        script = script.replace('%F1', f1)
+        script = script.replace('%F2', f2)
+        script = script.replace('%M', multi_base)
+        script = script.replace('%O', multi_other)
+        script = script.replace('%2', p2)
+
     return script.split('\n')
diff --git a/clang/test/3C/single_ptr_calloc.c b/clang/test/3C/single_ptr_calloc.c
index 0d011ca0ba40..0e9d4630e8b9 100644
--- a/clang/test/3C/single_ptr_calloc.c
+++ b/clang/test/3C/single_ptr_calloc.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/single_ptr_calloc.checked.c -- | count 0
-// RUN: rm %S/single_ptr_calloc.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 
 #include <stddef.h>
diff --git a/clang/test/3C/subtyp.c b/clang/test/3C/subtyp.c
index 14ff6807a42d..093a78890741 100644
--- a/clang/test/3C/subtyp.c
+++ b/clang/test/3C/subtyp.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/subtyp.checked.c -- | count 0
-// RUN: rm %S/subtyp.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 void take(int *p : itype(_Nt_array_ptr<int>));
 	//CHECK: void take(int *p : itype(_Nt_array_ptr<int>));
diff --git a/clang/test/3C/unsafeunion.c b/clang/test/3C/unsafeunion.c
index a2e891d93a8a..63ee154ed6a4 100644
--- a/clang/test/3C/unsafeunion.c
+++ b/clang/test/3C/unsafeunion.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/unsafeunion.checked.c -- | count 0
-// RUN: rm %S/unsafeunion.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);
diff --git a/clang/test/3C/unsigned_signed_cast.c b/clang/test/3C/unsigned_signed_cast.c
index ad9df747128e..032ed4018a73 100644
--- a/clang/test/3C/unsigned_signed_cast.c
+++ b/clang/test/3C/unsigned_signed_cast.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/unsigned_signed_cast.checked.c -- | count 0
-// RUN: rm %S/unsigned_signed_cast.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 /*unsigned integer cast*/
 
diff --git a/clang/test/3C/valist.c b/clang/test/3C/valist.c
index b76f7482f1f2..75ef80d6744c 100644
--- a/clang/test/3C/valist.c
+++ b/clang/test/3C/valist.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/valist.checked.c -- | count 0
-// RUN: rm %S/valist.checked.c
+// RUN: %S/3c-regtest.py --predefined-script common %s -t %t --clang '%clang'
 
 #include <stdarg.h>
 typedef int lua_State;