Move the testgenerator.py and processor.py tests to subdirectories. (#…

…590) We hope this will facilitate review of bulk edits to regression tests by making it easier to review each of these sets of tests together.
correctcomputation · May 18, 2021 · 81cbd4c · 81cbd4c
1 parent 2b8a064
commit 81cbd4c
Show file tree

Hide file tree

Showing 254 changed files with 18 additions and 2 deletions.
diff --git a/clang/test/3C/b10_allsafepointerstruct.c → ...est/3C/b_tests/b10_allsafepointerstruct.c b/clang/test/3C/b10_allsafepointerstruct.c → ...est/3C/b_tests/b10_allsafepointerstruct.c
diff --git a/clang/test/3C/b11_calleestructnp.c → clang/test/3C/b_tests/b11_calleestructnp.c b/clang/test/3C/b11_calleestructnp.c → clang/test/3C/b_tests/b11_calleestructnp.c
diff --git a/clang/test/3C/b12_callerstructnp.c → clang/test/3C/b_tests/b12_callerstructnp.c b/clang/test/3C/b12_callerstructnp.c → clang/test/3C/b_tests/b12_callerstructnp.c
diff --git a/clang/test/3C/b13_calleestructp.c → clang/test/3C/b_tests/b13_calleestructp.c b/clang/test/3C/b13_calleestructp.c → clang/test/3C/b_tests/b13_calleestructp.c
diff --git a/clang/test/3C/b14_callerstructp.c → clang/test/3C/b_tests/b14_callerstructp.c b/clang/test/3C/b14_callerstructp.c → clang/test/3C/b_tests/b14_callerstructp.c
diff --git a/clang/test/3C/b15_calleepointerstruct.c → ...test/3C/b_tests/b15_calleepointerstruct.c b/clang/test/3C/b15_calleepointerstruct.c → ...test/3C/b_tests/b15_calleepointerstruct.c
diff --git a/clang/test/3C/b16_callerpointerstruct.c → ...test/3C/b_tests/b16_callerpointerstruct.c b/clang/test/3C/b16_callerpointerstruct.c → ...test/3C/b_tests/b16_callerpointerstruct.c
diff --git a/clang/test/3C/b17_bothstructnp.c → clang/test/3C/b_tests/b17_bothstructnp.c b/clang/test/3C/b17_bothstructnp.c → clang/test/3C/b_tests/b17_bothstructnp.c
diff --git a/clang/test/3C/b18_bothstructp.c → clang/test/3C/b_tests/b18_bothstructp.c b/clang/test/3C/b18_bothstructp.c → clang/test/3C/b_tests/b18_bothstructp.c
diff --git a/clang/test/3C/b19_bothpointerstruct.c → ...g/test/3C/b_tests/b19_bothpointerstruct.c b/clang/test/3C/b19_bothpointerstruct.c → ...g/test/3C/b_tests/b19_bothpointerstruct.c
diff --git a/clang/test/3C/b1_allsafe.c → clang/test/3C/b_tests/b1_allsafe.c b/clang/test/3C/b1_allsafe.c → clang/test/3C/b_tests/b1_allsafe.c
diff --git a/...g/test/3C/b20_allsafepointerstructproto.c → ...C/b_tests/b20_allsafepointerstructproto.c b/...g/test/3C/b20_allsafepointerstructproto.c → ...C/b_tests/b20_allsafepointerstructproto.c
diff --git a/clang/test/3C/b21_calleepointerstructproto.c → ...3C/b_tests/b21_calleepointerstructproto.c b/clang/test/3C/b21_calleepointerstructproto.c → ...3C/b_tests/b21_calleepointerstructproto.c
diff --git a/clang/test/3C/b22_callerpointerstructproto.c → ...3C/b_tests/b22_callerpointerstructproto.c b/clang/test/3C/b22_callerpointerstructproto.c → ...3C/b_tests/b22_callerpointerstructproto.c
diff --git a/clang/test/3C/b23_explicitunsafecast.c → .../test/3C/b_tests/b23_explicitunsafecast.c b/clang/test/3C/b23_explicitunsafecast.c → .../test/3C/b_tests/b23_explicitunsafecast.c
diff --git a/clang/test/3C/b23_retswitchexplicit.c → ...g/test/3C/b_tests/b23_retswitchexplicit.c b/clang/test/3C/b23_retswitchexplicit.c → ...g/test/3C/b_tests/b23_retswitchexplicit.c
diff --git a/clang/test/3C/b24_implicitunsafecast.c → .../test/3C/b_tests/b24_implicitunsafecast.c b/clang/test/3C/b24_implicitunsafecast.c → .../test/3C/b_tests/b24_implicitunsafecast.c
diff --git a/clang/test/3C/b24_retswitchimplicit.c → ...g/test/3C/b_tests/b24_retswitchimplicit.c b/clang/test/3C/b24_retswitchimplicit.c → ...g/test/3C/b_tests/b24_retswitchimplicit.c
diff --git a/clang/test/3C/b25_castprotosafe.c → clang/test/3C/b_tests/b25_castprotosafe.c b/clang/test/3C/b25_castprotosafe.c → clang/test/3C/b_tests/b25_castprotosafe.c
diff --git a/clang/test/3C/b26_castprotounsafe.c → clang/test/3C/b_tests/b26_castprotounsafe.c b/clang/test/3C/b26_castprotounsafe.c → clang/test/3C/b_tests/b26_castprotounsafe.c
diff --git a/clang/test/3C/b26_castprotounsafeimplicit.c → .../3C/b_tests/b26_castprotounsafeimplicit.c b/clang/test/3C/b26_castprotounsafeimplicit.c → .../3C/b_tests/b26_castprotounsafeimplicit.c
diff --git a/...3C/b26_castprotounsafeimplicitretswitch.c → ...ts/b26_castprotounsafeimplicitretswitch.c b/...3C/b26_castprotounsafeimplicitretswitch.c → ...ts/b26_castprotounsafeimplicitretswitch.c
diff --git a/clang/test/3C/b27_structcastsafe.c → clang/test/3C/b_tests/b27_structcastsafe.c b/clang/test/3C/b27_structcastsafe.c → clang/test/3C/b_tests/b27_structcastsafe.c
diff --git a/clang/test/3C/b28_structcastexplicit.c → .../test/3C/b_tests/b28_structcastexplicit.c b/clang/test/3C/b28_structcastexplicit.c → .../test/3C/b_tests/b28_structcastexplicit.c
diff --git a/clang/test/3C/b28_structcastimplicit.c → .../test/3C/b_tests/b28_structcastimplicit.c b/clang/test/3C/b28_structcastimplicit.c → .../test/3C/b_tests/b28_structcastimplicit.c
diff --git a/clang/test/3C/b28_structimplicitretcast.c → ...st/3C/b_tests/b28_structimplicitretcast.c b/clang/test/3C/b28_structimplicitretcast.c → ...st/3C/b_tests/b28_structimplicitretcast.c
diff --git a/clang/test/3C/b29_structprotocastsafe.c → ...test/3C/b_tests/b29_structprotocastsafe.c b/clang/test/3C/b29_structprotocastsafe.c → ...test/3C/b_tests/b29_structprotocastsafe.c
diff --git a/...est/3C/b29_structprotocastsafeuseunsafe.c → ..._tests/b29_structprotocastsafeuseunsafe.c b/...est/3C/b29_structprotocastsafeuseunsafe.c → ..._tests/b29_structprotocastsafeuseunsafe.c
diff --git a/clang/test/3C/b2_calleeunsafe.c → clang/test/3C/b_tests/b2_calleeunsafe.c b/clang/test/3C/b2_calleeunsafe.c → clang/test/3C/b_tests/b2_calleeunsafe.c
diff --git a/..._structprotocastexplicitunsafeuseunsafe.c → ..._structprotocastexplicitunsafeuseunsafe.c b/..._structprotocastexplicitunsafeuseunsafe.c → ..._structprotocastexplicitunsafeuseunsafe.c
diff --git a/..._structprotocastimplicitunsafeuseunsafe.c → ..._structprotocastimplicitunsafeuseunsafe.c b/..._structprotocastimplicitunsafeuseunsafe.c → ..._structprotocastimplicitunsafeuseunsafe.c
diff --git a/...st/3C/b30_structprotocastunsafeexplicit.c → ...tests/b30_structprotocastunsafeexplicit.c b/...st/3C/b30_structprotocastunsafeexplicit.c → ...tests/b30_structprotocastunsafeexplicit.c
diff --git a/...st/3C/b30_structprotocastunsafeimplicit.c → ...tests/b30_structprotocastunsafeimplicit.c b/...st/3C/b30_structprotocastunsafeimplicit.c → ...tests/b30_structprotocastunsafeimplicit.c
diff --git a/..._structprotocastunsafeimplicitretswitch.c → ..._structprotocastunsafeimplicitretswitch.c b/..._structprotocastunsafeimplicitretswitch.c → ..._structprotocastunsafeimplicitretswitch.c
diff --git a/clang/test/3C/b30_structprotoconflict.c → ...test/3C/b_tests/b30_structprotoconflict.c b/clang/test/3C/b30_structprotoconflict.c → ...test/3C/b_tests/b30_structprotoconflict.c
diff --git a/...t/3C/b30_structprotoconflictbodyconvert.c → ...ests/b30_structprotoconflictbodyconvert.c b/...t/3C/b30_structprotoconflictbodyconvert.c → ...ests/b30_structprotoconflictbodyconvert.c
diff --git a/clang/test/3C/b3_onecallerunsafe.c → clang/test/3C/b_tests/b3_onecallerunsafe.c b/clang/test/3C/b3_onecallerunsafe.c → clang/test/3C/b_tests/b3_onecallerunsafe.c
diff --git a/clang/test/3C/b4_bothunsafe.c → clang/test/3C/b_tests/b4_bothunsafe.c b/clang/test/3C/b4_bothunsafe.c → clang/test/3C/b_tests/b4_bothunsafe.c
diff --git a/clang/test/3C/b5_calleeunsafeproto.c → clang/test/3C/b_tests/b5_calleeunsafeproto.c b/clang/test/3C/b5_calleeunsafeproto.c → clang/test/3C/b_tests/b5_calleeunsafeproto.c
diff --git a/clang/test/3C/b6_callerunsafeproto.c → clang/test/3C/b_tests/b6_callerunsafeproto.c b/clang/test/3C/b6_callerunsafeproto.c → clang/test/3C/b_tests/b6_callerunsafeproto.c
diff --git a/clang/test/3C/b7_allsafeproto.c → clang/test/3C/b_tests/b7_allsafeproto.c b/clang/test/3C/b7_allsafeproto.c → clang/test/3C/b_tests/b7_allsafeproto.c
diff --git a/clang/test/3C/b8_allsafestructnp.c → clang/test/3C/b_tests/b8_allsafestructnp.c b/clang/test/3C/b8_allsafestructnp.c → clang/test/3C/b_tests/b8_allsafestructnp.c
diff --git a/clang/test/3C/b9_allsafestructp.c → clang/test/3C/b_tests/b9_allsafestructp.c b/clang/test/3C/b9_allsafestructp.c → clang/test/3C/b_tests/b9_allsafestructp.c
diff --git a/clang/test/3C/find_bin.py b/clang/test/3C/find_bin.py
@@ -21,11 +21,13 @@ def die(msg):
 llvm_obj_maybe = os.environ.get('LLVM_OBJ')
 standard_build_dir = '../../../build'
 if llvm_obj_maybe is not None:
-    bin_path = llvm_obj_maybe + '/bin/'
+    # Now that some of the callers of find_bin call `chdir` afterwards, we have
+    # to make the path absolute here.
+    bin_path = os.path.abspath(llvm_obj_maybe) + '/bin/'
     if not os.path.isfile(bin_path + '3c'):
         die('$LLVM_OBJ is set but the bin directory does not contain 3c.')
 elif os.path.isdir(standard_build_dir):
-    bin_path = standard_build_dir + '/bin/'
+    bin_path = os.path.abspath(standard_build_dir) + '/bin/'
     if not os.path.isfile(bin_path + '3c'):
         die('The standard build directory exists but does not contain 3c.')
 elif lit.util.which('3c') is not None:

diff --git a/clang/test/3C/arrboth.c → clang/test/3C/generated_tests/arrboth.c b/clang/test/3C/arrboth.c → clang/test/3C/generated_tests/arrboth.c
diff --git a/clang/test/3C/arrbothmulti1.c → ...g/test/3C/generated_tests/arrbothmulti1.c b/clang/test/3C/arrbothmulti1.c → ...g/test/3C/generated_tests/arrbothmulti1.c
diff --git a/clang/test/3C/arrbothmulti2.c → ...g/test/3C/generated_tests/arrbothmulti2.c b/clang/test/3C/arrbothmulti2.c → ...g/test/3C/generated_tests/arrbothmulti2.c
diff --git a/clang/test/3C/arrcallee.c → clang/test/3C/generated_tests/arrcallee.c b/clang/test/3C/arrcallee.c → clang/test/3C/generated_tests/arrcallee.c
diff --git a/clang/test/3C/arrcalleemulti1.c → ...test/3C/generated_tests/arrcalleemulti1.c b/clang/test/3C/arrcalleemulti1.c → ...test/3C/generated_tests/arrcalleemulti1.c
diff --git a/clang/test/3C/arrcalleemulti2.c → ...test/3C/generated_tests/arrcalleemulti2.c b/clang/test/3C/arrcalleemulti2.c → ...test/3C/generated_tests/arrcalleemulti2.c
diff --git a/clang/test/3C/arrcaller.c → clang/test/3C/generated_tests/arrcaller.c b/clang/test/3C/arrcaller.c → clang/test/3C/generated_tests/arrcaller.c
diff --git a/clang/test/3C/arrcallermulti1.c → ...test/3C/generated_tests/arrcallermulti1.c b/clang/test/3C/arrcallermulti1.c → ...test/3C/generated_tests/arrcallermulti1.c
diff --git a/clang/test/3C/arrcallermulti2.c → ...test/3C/generated_tests/arrcallermulti2.c b/clang/test/3C/arrcallermulti2.c → ...test/3C/generated_tests/arrcallermulti2.c
diff --git a/clang/test/3C/arrinstructboth.c → ...test/3C/generated_tests/arrinstructboth.c b/clang/test/3C/arrinstructboth.c → ...test/3C/generated_tests/arrinstructboth.c
diff --git a/clang/test/3C/arrinstructbothmulti1.c → ...C/generated_tests/arrinstructbothmulti1.c b/clang/test/3C/arrinstructbothmulti1.c → ...C/generated_tests/arrinstructbothmulti1.c
diff --git a/clang/test/3C/arrinstructbothmulti2.c → ...C/generated_tests/arrinstructbothmulti2.c b/clang/test/3C/arrinstructbothmulti2.c → ...C/generated_tests/arrinstructbothmulti2.c
diff --git a/clang/test/3C/arrinstructcallee.c → ...st/3C/generated_tests/arrinstructcallee.c b/clang/test/3C/arrinstructcallee.c → ...st/3C/generated_tests/arrinstructcallee.c
diff --git a/clang/test/3C/arrinstructcalleemulti1.c → ...generated_tests/arrinstructcalleemulti1.c b/clang/test/3C/arrinstructcalleemulti1.c → ...generated_tests/arrinstructcalleemulti1.c
diff --git a/clang/test/3C/arrinstructcalleemulti2.c → ...generated_tests/arrinstructcalleemulti2.c b/clang/test/3C/arrinstructcalleemulti2.c → ...generated_tests/arrinstructcalleemulti2.c
diff --git a/clang/test/3C/arrinstructcaller.c → ...st/3C/generated_tests/arrinstructcaller.c b/clang/test/3C/arrinstructcaller.c → ...st/3C/generated_tests/arrinstructcaller.c
diff --git a/clang/test/3C/arrinstructcallermulti1.c → ...generated_tests/arrinstructcallermulti1.c b/clang/test/3C/arrinstructcallermulti1.c → ...generated_tests/arrinstructcallermulti1.c
diff --git a/clang/test/3C/arrinstructcallermulti2.c → ...generated_tests/arrinstructcallermulti2.c b/clang/test/3C/arrinstructcallermulti2.c → ...generated_tests/arrinstructcallermulti2.c
diff --git a/clang/test/3C/arrinstructprotoboth.c → ...3C/generated_tests/arrinstructprotoboth.c b/clang/test/3C/arrinstructprotoboth.c → ...3C/generated_tests/arrinstructprotoboth.c
diff --git a/clang/test/3C/arrinstructprotocallee.c → .../generated_tests/arrinstructprotocallee.c b/clang/test/3C/arrinstructprotocallee.c → .../generated_tests/arrinstructprotocallee.c
diff --git a/clang/test/3C/arrinstructprotocaller.c → .../generated_tests/arrinstructprotocaller.c b/clang/test/3C/arrinstructprotocaller.c → .../generated_tests/arrinstructprotocaller.c
diff --git a/clang/test/3C/arrinstructprotosafe.c → ...3C/generated_tests/arrinstructprotosafe.c b/clang/test/3C/arrinstructprotosafe.c → ...3C/generated_tests/arrinstructprotosafe.c
diff --git a/clang/test/3C/arrinstructsafe.c → ...test/3C/generated_tests/arrinstructsafe.c b/clang/test/3C/arrinstructsafe.c → ...test/3C/generated_tests/arrinstructsafe.c
diff --git a/clang/test/3C/arrinstructsafemulti1.c → ...C/generated_tests/arrinstructsafemulti1.c b/clang/test/3C/arrinstructsafemulti1.c → ...C/generated_tests/arrinstructsafemulti1.c
diff --git a/clang/test/3C/arrinstructsafemulti2.c → ...C/generated_tests/arrinstructsafemulti2.c b/clang/test/3C/arrinstructsafemulti2.c → ...C/generated_tests/arrinstructsafemulti2.c
diff --git a/clang/test/3C/arrofstructboth.c → ...test/3C/generated_tests/arrofstructboth.c b/clang/test/3C/arrofstructboth.c → ...test/3C/generated_tests/arrofstructboth.c
diff --git a/clang/test/3C/arrofstructbothmulti1.c → ...C/generated_tests/arrofstructbothmulti1.c b/clang/test/3C/arrofstructbothmulti1.c → ...C/generated_tests/arrofstructbothmulti1.c
diff --git a/clang/test/3C/arrofstructbothmulti2.c → ...C/generated_tests/arrofstructbothmulti2.c b/clang/test/3C/arrofstructbothmulti2.c → ...C/generated_tests/arrofstructbothmulti2.c
diff --git a/clang/test/3C/arrofstructcallee.c → ...st/3C/generated_tests/arrofstructcallee.c b/clang/test/3C/arrofstructcallee.c → ...st/3C/generated_tests/arrofstructcallee.c
diff --git a/clang/test/3C/arrofstructcalleemulti1.c → ...generated_tests/arrofstructcalleemulti1.c b/clang/test/3C/arrofstructcalleemulti1.c → ...generated_tests/arrofstructcalleemulti1.c
diff --git a/clang/test/3C/arrofstructcalleemulti2.c → ...generated_tests/arrofstructcalleemulti2.c b/clang/test/3C/arrofstructcalleemulti2.c → ...generated_tests/arrofstructcalleemulti2.c
diff --git a/clang/test/3C/arrofstructcaller.c → ...st/3C/generated_tests/arrofstructcaller.c b/clang/test/3C/arrofstructcaller.c → ...st/3C/generated_tests/arrofstructcaller.c
diff --git a/clang/test/3C/arrofstructcallermulti1.c → ...generated_tests/arrofstructcallermulti1.c b/clang/test/3C/arrofstructcallermulti1.c → ...generated_tests/arrofstructcallermulti1.c
diff --git a/clang/test/3C/arrofstructcallermulti2.c → ...generated_tests/arrofstructcallermulti2.c b/clang/test/3C/arrofstructcallermulti2.c → ...generated_tests/arrofstructcallermulti2.c
diff --git a/clang/test/3C/arrofstructprotoboth.c → ...3C/generated_tests/arrofstructprotoboth.c b/clang/test/3C/arrofstructprotoboth.c → ...3C/generated_tests/arrofstructprotoboth.c
diff --git a/clang/test/3C/arrofstructprotocallee.c → .../generated_tests/arrofstructprotocallee.c b/clang/test/3C/arrofstructprotocallee.c → .../generated_tests/arrofstructprotocallee.c
diff --git a/clang/test/3C/arrofstructprotocaller.c → .../generated_tests/arrofstructprotocaller.c b/clang/test/3C/arrofstructprotocaller.c → .../generated_tests/arrofstructprotocaller.c
diff --git a/clang/test/3C/arrofstructprotosafe.c → ...3C/generated_tests/arrofstructprotosafe.c b/clang/test/3C/arrofstructprotosafe.c → ...3C/generated_tests/arrofstructprotosafe.c
diff --git a/clang/test/3C/arrofstructsafe.c → ...test/3C/generated_tests/arrofstructsafe.c b/clang/test/3C/arrofstructsafe.c → ...test/3C/generated_tests/arrofstructsafe.c
diff --git a/clang/test/3C/arrofstructsafemulti1.c → ...C/generated_tests/arrofstructsafemulti1.c b/clang/test/3C/arrofstructsafemulti1.c → ...C/generated_tests/arrofstructsafemulti1.c
diff --git a/clang/test/3C/arrofstructsafemulti2.c → ...C/generated_tests/arrofstructsafemulti2.c b/clang/test/3C/arrofstructsafemulti2.c → ...C/generated_tests/arrofstructsafemulti2.c
diff --git a/clang/test/3C/arrprotoboth.c → clang/test/3C/generated_tests/arrprotoboth.c b/clang/test/3C/arrprotoboth.c → clang/test/3C/generated_tests/arrprotoboth.c
diff --git a/clang/test/3C/arrprotocallee.c → .../test/3C/generated_tests/arrprotocallee.c b/clang/test/3C/arrprotocallee.c → .../test/3C/generated_tests/arrprotocallee.c
diff --git a/clang/test/3C/arrprotocaller.c → .../test/3C/generated_tests/arrprotocaller.c b/clang/test/3C/arrprotocaller.c → .../test/3C/generated_tests/arrprotocaller.c
diff --git a/clang/test/3C/arrprotosafe.c → clang/test/3C/generated_tests/arrprotosafe.c b/clang/test/3C/arrprotosafe.c → clang/test/3C/generated_tests/arrprotosafe.c
diff --git a/clang/test/3C/arrsafe.c → clang/test/3C/generated_tests/arrsafe.c b/clang/test/3C/arrsafe.c → clang/test/3C/generated_tests/arrsafe.c
diff --git a/clang/test/3C/arrsafemulti1.c → ...g/test/3C/generated_tests/arrsafemulti1.c b/clang/test/3C/arrsafemulti1.c → ...g/test/3C/generated_tests/arrsafemulti1.c
diff --git a/clang/test/3C/arrsafemulti2.c → ...g/test/3C/generated_tests/arrsafemulti2.c b/clang/test/3C/arrsafemulti2.c → ...g/test/3C/generated_tests/arrsafemulti2.c
diff --git a/clang/test/3C/arrstructboth.c → ...g/test/3C/generated_tests/arrstructboth.c b/clang/test/3C/arrstructboth.c → ...g/test/3C/generated_tests/arrstructboth.c
diff --git a/clang/test/3C/arrstructbothmulti1.c → .../3C/generated_tests/arrstructbothmulti1.c b/clang/test/3C/arrstructbothmulti1.c → .../3C/generated_tests/arrstructbothmulti1.c
diff --git a/clang/test/3C/arrstructbothmulti2.c → .../3C/generated_tests/arrstructbothmulti2.c b/clang/test/3C/arrstructbothmulti2.c → .../3C/generated_tests/arrstructbothmulti2.c
diff --git a/clang/test/3C/arrstructcallee.c → ...test/3C/generated_tests/arrstructcallee.c b/clang/test/3C/arrstructcallee.c → ...test/3C/generated_tests/arrstructcallee.c
diff --git a/clang/test/3C/arrstructcalleemulti1.c → ...C/generated_tests/arrstructcalleemulti1.c b/clang/test/3C/arrstructcalleemulti1.c → ...C/generated_tests/arrstructcalleemulti1.c
diff --git a/clang/test/3C/arrstructcalleemulti2.c → ...C/generated_tests/arrstructcalleemulti2.c b/clang/test/3C/arrstructcalleemulti2.c → ...C/generated_tests/arrstructcalleemulti2.c
diff --git a/clang/test/3C/arrstructcaller.c → ...test/3C/generated_tests/arrstructcaller.c b/clang/test/3C/arrstructcaller.c → ...test/3C/generated_tests/arrstructcaller.c
diff --git a/clang/test/3C/arrstructcallermulti1.c → ...C/generated_tests/arrstructcallermulti1.c b/clang/test/3C/arrstructcallermulti1.c → ...C/generated_tests/arrstructcallermulti1.c
diff --git a/clang/test/3C/arrstructcallermulti2.c → ...C/generated_tests/arrstructcallermulti2.c b/clang/test/3C/arrstructcallermulti2.c → ...C/generated_tests/arrstructcallermulti2.c
diff --git a/clang/test/3C/arrstructprotoboth.c → ...t/3C/generated_tests/arrstructprotoboth.c b/clang/test/3C/arrstructprotoboth.c → ...t/3C/generated_tests/arrstructprotoboth.c
diff --git a/clang/test/3C/arrstructprotocallee.c → ...3C/generated_tests/arrstructprotocallee.c b/clang/test/3C/arrstructprotocallee.c → ...3C/generated_tests/arrstructprotocallee.c
diff --git a/clang/test/3C/arrstructprotocaller.c → ...3C/generated_tests/arrstructprotocaller.c b/clang/test/3C/arrstructprotocaller.c → ...3C/generated_tests/arrstructprotocaller.c
diff --git a/clang/test/3C/arrstructprotosafe.c → ...t/3C/generated_tests/arrstructprotosafe.c b/clang/test/3C/arrstructprotosafe.c → ...t/3C/generated_tests/arrstructprotosafe.c
diff --git a/clang/test/3C/arrstructsafe.c → ...g/test/3C/generated_tests/arrstructsafe.c b/clang/test/3C/arrstructsafe.c → ...g/test/3C/generated_tests/arrstructsafe.c
diff --git a/clang/test/3C/arrstructsafemulti1.c → .../3C/generated_tests/arrstructsafemulti1.c b/clang/test/3C/arrstructsafemulti1.c → .../3C/generated_tests/arrstructsafemulti1.c
diff --git a/clang/test/3C/arrstructsafemulti2.c → .../3C/generated_tests/arrstructsafemulti2.c b/clang/test/3C/arrstructsafemulti2.c → .../3C/generated_tests/arrstructsafemulti2.c
diff --git a/clang/test/3C/fptrarrboth.c → clang/test/3C/generated_tests/fptrarrboth.c b/clang/test/3C/fptrarrboth.c → clang/test/3C/generated_tests/fptrarrboth.c
diff --git a/clang/test/3C/fptrarrbothmulti1.c → ...st/3C/generated_tests/fptrarrbothmulti1.c b/clang/test/3C/fptrarrbothmulti1.c → ...st/3C/generated_tests/fptrarrbothmulti1.c
diff --git a/clang/test/3C/fptrarrbothmulti2.c → ...st/3C/generated_tests/fptrarrbothmulti2.c b/clang/test/3C/fptrarrbothmulti2.c → ...st/3C/generated_tests/fptrarrbothmulti2.c
diff --git a/clang/test/3C/fptrarrcallee.c → ...g/test/3C/generated_tests/fptrarrcallee.c b/clang/test/3C/fptrarrcallee.c → ...g/test/3C/generated_tests/fptrarrcallee.c
diff --git a/clang/test/3C/fptrarrcalleemulti1.c → .../3C/generated_tests/fptrarrcalleemulti1.c b/clang/test/3C/fptrarrcalleemulti1.c → .../3C/generated_tests/fptrarrcalleemulti1.c
diff --git a/clang/test/3C/fptrarrcalleemulti2.c → .../3C/generated_tests/fptrarrcalleemulti2.c b/clang/test/3C/fptrarrcalleemulti2.c → .../3C/generated_tests/fptrarrcalleemulti2.c
diff --git a/clang/test/3C/fptrarrcaller.c → ...g/test/3C/generated_tests/fptrarrcaller.c b/clang/test/3C/fptrarrcaller.c → ...g/test/3C/generated_tests/fptrarrcaller.c
diff --git a/clang/test/3C/fptrarrcallermulti1.c → .../3C/generated_tests/fptrarrcallermulti1.c b/clang/test/3C/fptrarrcallermulti1.c → .../3C/generated_tests/fptrarrcallermulti1.c
diff --git a/clang/test/3C/fptrarrcallermulti2.c → .../3C/generated_tests/fptrarrcallermulti2.c b/clang/test/3C/fptrarrcallermulti2.c → .../3C/generated_tests/fptrarrcallermulti2.c
diff --git a/clang/test/3C/fptrarrinstructboth.c → .../3C/generated_tests/fptrarrinstructboth.c b/clang/test/3C/fptrarrinstructboth.c → .../3C/generated_tests/fptrarrinstructboth.c
diff --git a/clang/test/3C/fptrarrinstructbothmulti1.c → ...nerated_tests/fptrarrinstructbothmulti1.c b/clang/test/3C/fptrarrinstructbothmulti1.c → ...nerated_tests/fptrarrinstructbothmulti1.c
diff --git a/clang/test/3C/fptrarrinstructbothmulti2.c → ...nerated_tests/fptrarrinstructbothmulti2.c b/clang/test/3C/fptrarrinstructbothmulti2.c → ...nerated_tests/fptrarrinstructbothmulti2.c
diff --git a/clang/test/3C/fptrarrinstructcallee.c → ...C/generated_tests/fptrarrinstructcallee.c b/clang/test/3C/fptrarrinstructcallee.c → ...C/generated_tests/fptrarrinstructcallee.c
diff --git a/clang/test/3C/fptrarrinstructcalleemulti1.c → ...rated_tests/fptrarrinstructcalleemulti1.c b/clang/test/3C/fptrarrinstructcalleemulti1.c → ...rated_tests/fptrarrinstructcalleemulti1.c
diff --git a/clang/test/3C/fptrarrinstructcalleemulti2.c → ...rated_tests/fptrarrinstructcalleemulti2.c b/clang/test/3C/fptrarrinstructcalleemulti2.c → ...rated_tests/fptrarrinstructcalleemulti2.c
diff --git a/clang/test/3C/fptrarrinstructcaller.c → ...C/generated_tests/fptrarrinstructcaller.c b/clang/test/3C/fptrarrinstructcaller.c → ...C/generated_tests/fptrarrinstructcaller.c
diff --git a/clang/test/3C/fptrarrinstructcallermulti1.c → ...rated_tests/fptrarrinstructcallermulti1.c b/clang/test/3C/fptrarrinstructcallermulti1.c → ...rated_tests/fptrarrinstructcallermulti1.c
diff --git a/clang/test/3C/fptrarrinstructcallermulti2.c → ...rated_tests/fptrarrinstructcallermulti2.c b/clang/test/3C/fptrarrinstructcallermulti2.c → ...rated_tests/fptrarrinstructcallermulti2.c
diff --git a/clang/test/3C/fptrarrinstructprotoboth.c → ...enerated_tests/fptrarrinstructprotoboth.c b/clang/test/3C/fptrarrinstructprotoboth.c → ...enerated_tests/fptrarrinstructprotoboth.c
diff --git a/clang/test/3C/fptrarrinstructprotocallee.c → ...erated_tests/fptrarrinstructprotocallee.c b/clang/test/3C/fptrarrinstructprotocallee.c → ...erated_tests/fptrarrinstructprotocallee.c
diff --git a/clang/test/3C/fptrarrinstructprotocaller.c → ...erated_tests/fptrarrinstructprotocaller.c b/clang/test/3C/fptrarrinstructprotocaller.c → ...erated_tests/fptrarrinstructprotocaller.c
diff --git a/clang/test/3C/fptrarrinstructprotosafe.c → ...enerated_tests/fptrarrinstructprotosafe.c b/clang/test/3C/fptrarrinstructprotosafe.c → ...enerated_tests/fptrarrinstructprotosafe.c
diff --git a/clang/test/3C/fptrarrinstructsafe.c → .../3C/generated_tests/fptrarrinstructsafe.c b/clang/test/3C/fptrarrinstructsafe.c → .../3C/generated_tests/fptrarrinstructsafe.c
diff --git a/clang/test/3C/fptrarrinstructsafemulti1.c → ...nerated_tests/fptrarrinstructsafemulti1.c b/clang/test/3C/fptrarrinstructsafemulti1.c → ...nerated_tests/fptrarrinstructsafemulti1.c
diff --git a/clang/test/3C/fptrarrinstructsafemulti2.c → ...nerated_tests/fptrarrinstructsafemulti2.c b/clang/test/3C/fptrarrinstructsafemulti2.c → ...nerated_tests/fptrarrinstructsafemulti2.c
diff --git a/clang/test/3C/fptrarrprotoboth.c → ...est/3C/generated_tests/fptrarrprotoboth.c b/clang/test/3C/fptrarrprotoboth.c → ...est/3C/generated_tests/fptrarrprotoboth.c
diff --git a/clang/test/3C/fptrarrprotocallee.c → ...t/3C/generated_tests/fptrarrprotocallee.c b/clang/test/3C/fptrarrprotocallee.c → ...t/3C/generated_tests/fptrarrprotocallee.c
diff --git a/clang/test/3C/fptrarrprotocaller.c → ...t/3C/generated_tests/fptrarrprotocaller.c b/clang/test/3C/fptrarrprotocaller.c → ...t/3C/generated_tests/fptrarrprotocaller.c
diff --git a/clang/test/3C/fptrarrprotosafe.c → ...est/3C/generated_tests/fptrarrprotosafe.c b/clang/test/3C/fptrarrprotosafe.c → ...est/3C/generated_tests/fptrarrprotosafe.c
diff --git a/clang/test/3C/fptrarrsafe.c → clang/test/3C/generated_tests/fptrarrsafe.c b/clang/test/3C/fptrarrsafe.c → clang/test/3C/generated_tests/fptrarrsafe.c
diff --git a/clang/test/3C/fptrarrsafemulti1.c → ...st/3C/generated_tests/fptrarrsafemulti1.c b/clang/test/3C/fptrarrsafemulti1.c → ...st/3C/generated_tests/fptrarrsafemulti1.c
diff --git a/clang/test/3C/fptrarrsafemulti2.c → ...st/3C/generated_tests/fptrarrsafemulti2.c b/clang/test/3C/fptrarrsafemulti2.c → ...st/3C/generated_tests/fptrarrsafemulti2.c
diff --git a/clang/test/3C/fptrarrstructboth.c → ...st/3C/generated_tests/fptrarrstructboth.c b/clang/test/3C/fptrarrstructboth.c → ...st/3C/generated_tests/fptrarrstructboth.c
diff --git a/clang/test/3C/fptrarrstructbothmulti1.c → ...generated_tests/fptrarrstructbothmulti1.c b/clang/test/3C/fptrarrstructbothmulti1.c → ...generated_tests/fptrarrstructbothmulti1.c
diff --git a/clang/test/3C/fptrarrstructbothmulti2.c → ...generated_tests/fptrarrstructbothmulti2.c b/clang/test/3C/fptrarrstructbothmulti2.c → ...generated_tests/fptrarrstructbothmulti2.c
diff --git a/clang/test/3C/fptrarrstructcallee.c → .../3C/generated_tests/fptrarrstructcallee.c b/clang/test/3C/fptrarrstructcallee.c → .../3C/generated_tests/fptrarrstructcallee.c
diff --git a/clang/test/3C/fptrarrstructcalleemulti1.c → ...nerated_tests/fptrarrstructcalleemulti1.c b/clang/test/3C/fptrarrstructcalleemulti1.c → ...nerated_tests/fptrarrstructcalleemulti1.c
diff --git a/clang/test/3C/fptrarrstructcalleemulti2.c → ...nerated_tests/fptrarrstructcalleemulti2.c b/clang/test/3C/fptrarrstructcalleemulti2.c → ...nerated_tests/fptrarrstructcalleemulti2.c
diff --git a/clang/test/3C/fptrarrstructcaller.c → .../3C/generated_tests/fptrarrstructcaller.c b/clang/test/3C/fptrarrstructcaller.c → .../3C/generated_tests/fptrarrstructcaller.c
diff --git a/clang/test/3C/fptrarrstructcallermulti1.c → ...nerated_tests/fptrarrstructcallermulti1.c b/clang/test/3C/fptrarrstructcallermulti1.c → ...nerated_tests/fptrarrstructcallermulti1.c
diff --git a/clang/test/3C/fptrarrstructcallermulti2.c → ...nerated_tests/fptrarrstructcallermulti2.c b/clang/test/3C/fptrarrstructcallermulti2.c → ...nerated_tests/fptrarrstructcallermulti2.c
diff --git a/clang/test/3C/fptrarrstructprotoboth.c → .../generated_tests/fptrarrstructprotoboth.c b/clang/test/3C/fptrarrstructprotoboth.c → .../generated_tests/fptrarrstructprotoboth.c
diff --git a/clang/test/3C/fptrarrstructprotocallee.c → ...enerated_tests/fptrarrstructprotocallee.c b/clang/test/3C/fptrarrstructprotocallee.c → ...enerated_tests/fptrarrstructprotocallee.c
diff --git a/clang/test/3C/fptrarrstructprotocaller.c → ...enerated_tests/fptrarrstructprotocaller.c b/clang/test/3C/fptrarrstructprotocaller.c → ...enerated_tests/fptrarrstructprotocaller.c
diff --git a/clang/test/3C/fptrarrstructprotosafe.c → .../generated_tests/fptrarrstructprotosafe.c b/clang/test/3C/fptrarrstructprotosafe.c → .../generated_tests/fptrarrstructprotosafe.c
diff --git a/clang/test/3C/fptrarrstructsafe.c → ...st/3C/generated_tests/fptrarrstructsafe.c b/clang/test/3C/fptrarrstructsafe.c → ...st/3C/generated_tests/fptrarrstructsafe.c
diff --git a/clang/test/3C/fptrarrstructsafemulti1.c → ...generated_tests/fptrarrstructsafemulti1.c b/clang/test/3C/fptrarrstructsafemulti1.c → ...generated_tests/fptrarrstructsafemulti1.c
diff --git a/clang/test/3C/fptrarrstructsafemulti2.c → ...generated_tests/fptrarrstructsafemulti2.c b/clang/test/3C/fptrarrstructsafemulti2.c → ...generated_tests/fptrarrstructsafemulti2.c
diff --git a/clang/test/3C/fptrinstructboth.c → ...est/3C/generated_tests/fptrinstructboth.c b/clang/test/3C/fptrinstructboth.c → ...est/3C/generated_tests/fptrinstructboth.c
diff --git a/clang/test/3C/fptrinstructbothmulti1.c → .../generated_tests/fptrinstructbothmulti1.c b/clang/test/3C/fptrinstructbothmulti1.c → .../generated_tests/fptrinstructbothmulti1.c
diff --git a/clang/test/3C/fptrinstructbothmulti2.c → .../generated_tests/fptrinstructbothmulti2.c b/clang/test/3C/fptrinstructbothmulti2.c → .../generated_tests/fptrinstructbothmulti2.c
diff --git a/clang/test/3C/fptrinstructcallee.c → ...t/3C/generated_tests/fptrinstructcallee.c b/clang/test/3C/fptrinstructcallee.c → ...t/3C/generated_tests/fptrinstructcallee.c
diff --git a/clang/test/3C/fptrinstructcalleemulti1.c → ...enerated_tests/fptrinstructcalleemulti1.c b/clang/test/3C/fptrinstructcalleemulti1.c → ...enerated_tests/fptrinstructcalleemulti1.c
diff --git a/clang/test/3C/fptrinstructcalleemulti2.c → ...enerated_tests/fptrinstructcalleemulti2.c b/clang/test/3C/fptrinstructcalleemulti2.c → ...enerated_tests/fptrinstructcalleemulti2.c
diff --git a/clang/test/3C/fptrinstructcaller.c → ...t/3C/generated_tests/fptrinstructcaller.c b/clang/test/3C/fptrinstructcaller.c → ...t/3C/generated_tests/fptrinstructcaller.c
diff --git a/clang/test/3C/fptrinstructcallermulti1.c → ...enerated_tests/fptrinstructcallermulti1.c b/clang/test/3C/fptrinstructcallermulti1.c → ...enerated_tests/fptrinstructcallermulti1.c
diff --git a/clang/test/3C/fptrinstructcallermulti2.c → ...enerated_tests/fptrinstructcallermulti2.c b/clang/test/3C/fptrinstructcallermulti2.c → ...enerated_tests/fptrinstructcallermulti2.c
diff --git a/clang/test/3C/fptrinstructprotoboth.c → ...C/generated_tests/fptrinstructprotoboth.c b/clang/test/3C/fptrinstructprotoboth.c → ...C/generated_tests/fptrinstructprotoboth.c
diff --git a/clang/test/3C/fptrinstructprotocallee.c → ...generated_tests/fptrinstructprotocallee.c b/clang/test/3C/fptrinstructprotocallee.c → ...generated_tests/fptrinstructprotocallee.c
diff --git a/clang/test/3C/fptrinstructprotocaller.c → ...generated_tests/fptrinstructprotocaller.c b/clang/test/3C/fptrinstructprotocaller.c → ...generated_tests/fptrinstructprotocaller.c
diff --git a/clang/test/3C/fptrinstructprotosafe.c → ...C/generated_tests/fptrinstructprotosafe.c b/clang/test/3C/fptrinstructprotosafe.c → ...C/generated_tests/fptrinstructprotosafe.c
diff --git a/clang/test/3C/fptrinstructsafe.c → ...est/3C/generated_tests/fptrinstructsafe.c b/clang/test/3C/fptrinstructsafe.c → ...est/3C/generated_tests/fptrinstructsafe.c
diff --git a/clang/test/3C/fptrinstructsafemulti1.c → .../generated_tests/fptrinstructsafemulti1.c b/clang/test/3C/fptrinstructsafemulti1.c → .../generated_tests/fptrinstructsafemulti1.c
diff --git a/clang/test/3C/fptrinstructsafemulti2.c → .../generated_tests/fptrinstructsafemulti2.c b/clang/test/3C/fptrinstructsafemulti2.c → .../generated_tests/fptrinstructsafemulti2.c
diff --git a/clang/test/3C/fptrsafeboth.c → clang/test/3C/generated_tests/fptrsafeboth.c b/clang/test/3C/fptrsafeboth.c → clang/test/3C/generated_tests/fptrsafeboth.c
diff --git a/clang/test/3C/fptrsafebothmulti1.c → ...t/3C/generated_tests/fptrsafebothmulti1.c b/clang/test/3C/fptrsafebothmulti1.c → ...t/3C/generated_tests/fptrsafebothmulti1.c
diff --git a/clang/test/3C/fptrsafebothmulti2.c → ...t/3C/generated_tests/fptrsafebothmulti2.c b/clang/test/3C/fptrsafebothmulti2.c → ...t/3C/generated_tests/fptrsafebothmulti2.c
diff --git a/clang/test/3C/fptrsafecallee.c → .../test/3C/generated_tests/fptrsafecallee.c b/clang/test/3C/fptrsafecallee.c → .../test/3C/generated_tests/fptrsafecallee.c
diff --git a/clang/test/3C/fptrsafecalleemulti1.c → ...3C/generated_tests/fptrsafecalleemulti1.c b/clang/test/3C/fptrsafecalleemulti1.c → ...3C/generated_tests/fptrsafecalleemulti1.c
diff --git a/clang/test/3C/fptrsafecalleemulti2.c → ...3C/generated_tests/fptrsafecalleemulti2.c b/clang/test/3C/fptrsafecalleemulti2.c → ...3C/generated_tests/fptrsafecalleemulti2.c
diff --git a/clang/test/3C/fptrsafecaller.c → .../test/3C/generated_tests/fptrsafecaller.c b/clang/test/3C/fptrsafecaller.c → .../test/3C/generated_tests/fptrsafecaller.c
diff --git a/clang/test/3C/fptrsafecallermulti1.c → ...3C/generated_tests/fptrsafecallermulti1.c b/clang/test/3C/fptrsafecallermulti1.c → ...3C/generated_tests/fptrsafecallermulti1.c
diff --git a/clang/test/3C/fptrsafecallermulti2.c → ...3C/generated_tests/fptrsafecallermulti2.c b/clang/test/3C/fptrsafecallermulti2.c → ...3C/generated_tests/fptrsafecallermulti2.c
diff --git a/clang/test/3C/fptrsafeprotoboth.c → ...st/3C/generated_tests/fptrsafeprotoboth.c b/clang/test/3C/fptrsafeprotoboth.c → ...st/3C/generated_tests/fptrsafeprotoboth.c
diff --git a/clang/test/3C/fptrsafeprotocallee.c → .../3C/generated_tests/fptrsafeprotocallee.c b/clang/test/3C/fptrsafeprotocallee.c → .../3C/generated_tests/fptrsafeprotocallee.c
diff --git a/clang/test/3C/fptrsafeprotocaller.c → .../3C/generated_tests/fptrsafeprotocaller.c b/clang/test/3C/fptrsafeprotocaller.c → .../3C/generated_tests/fptrsafeprotocaller.c
diff --git a/clang/test/3C/fptrsafeprotosafe.c → ...st/3C/generated_tests/fptrsafeprotosafe.c b/clang/test/3C/fptrsafeprotosafe.c → ...st/3C/generated_tests/fptrsafeprotosafe.c
diff --git a/clang/test/3C/fptrsafesafe.c → clang/test/3C/generated_tests/fptrsafesafe.c b/clang/test/3C/fptrsafesafe.c → clang/test/3C/generated_tests/fptrsafesafe.c
diff --git a/clang/test/3C/fptrsafesafemulti1.c → ...t/3C/generated_tests/fptrsafesafemulti1.c b/clang/test/3C/fptrsafesafemulti1.c → ...t/3C/generated_tests/fptrsafesafemulti1.c
diff --git a/clang/test/3C/fptrsafesafemulti2.c → ...t/3C/generated_tests/fptrsafesafemulti2.c b/clang/test/3C/fptrsafesafemulti2.c → ...t/3C/generated_tests/fptrsafesafemulti2.c
diff --git a/clang/test/3C/fptrunsafeboth.c → .../test/3C/generated_tests/fptrunsafeboth.c b/clang/test/3C/fptrunsafeboth.c → .../test/3C/generated_tests/fptrunsafeboth.c
diff --git a/clang/test/3C/fptrunsafebothmulti1.c → ...3C/generated_tests/fptrunsafebothmulti1.c b/clang/test/3C/fptrunsafebothmulti1.c → ...3C/generated_tests/fptrunsafebothmulti1.c
diff --git a/clang/test/3C/fptrunsafebothmulti2.c → ...3C/generated_tests/fptrunsafebothmulti2.c b/clang/test/3C/fptrunsafebothmulti2.c → ...3C/generated_tests/fptrunsafebothmulti2.c
diff --git a/clang/test/3C/fptrunsafecallee.c → ...est/3C/generated_tests/fptrunsafecallee.c b/clang/test/3C/fptrunsafecallee.c → ...est/3C/generated_tests/fptrunsafecallee.c
diff --git a/clang/test/3C/fptrunsafecalleemulti1.c → .../generated_tests/fptrunsafecalleemulti1.c b/clang/test/3C/fptrunsafecalleemulti1.c → .../generated_tests/fptrunsafecalleemulti1.c
diff --git a/clang/test/3C/fptrunsafecalleemulti2.c → .../generated_tests/fptrunsafecalleemulti2.c b/clang/test/3C/fptrunsafecalleemulti2.c → .../generated_tests/fptrunsafecalleemulti2.c
diff --git a/clang/test/3C/fptrunsafecaller.c → ...est/3C/generated_tests/fptrunsafecaller.c b/clang/test/3C/fptrunsafecaller.c → ...est/3C/generated_tests/fptrunsafecaller.c
diff --git a/clang/test/3C/fptrunsafecallermulti1.c → .../generated_tests/fptrunsafecallermulti1.c b/clang/test/3C/fptrunsafecallermulti1.c → .../generated_tests/fptrunsafecallermulti1.c
diff --git a/clang/test/3C/fptrunsafecallermulti2.c → .../generated_tests/fptrunsafecallermulti2.c b/clang/test/3C/fptrunsafecallermulti2.c → .../generated_tests/fptrunsafecallermulti2.c
diff --git a/clang/test/3C/fptrunsafeprotoboth.c → .../3C/generated_tests/fptrunsafeprotoboth.c b/clang/test/3C/fptrunsafeprotoboth.c → .../3C/generated_tests/fptrunsafeprotoboth.c
diff --git a/clang/test/3C/fptrunsafeprotocallee.c → ...C/generated_tests/fptrunsafeprotocallee.c b/clang/test/3C/fptrunsafeprotocallee.c → ...C/generated_tests/fptrunsafeprotocallee.c
diff --git a/clang/test/3C/fptrunsafeprotocaller.c → ...C/generated_tests/fptrunsafeprotocaller.c b/clang/test/3C/fptrunsafeprotocaller.c → ...C/generated_tests/fptrunsafeprotocaller.c
diff --git a/clang/test/3C/fptrunsafeprotosafe.c → .../3C/generated_tests/fptrunsafeprotosafe.c b/clang/test/3C/fptrunsafeprotosafe.c → .../3C/generated_tests/fptrunsafeprotosafe.c
diff --git a/clang/test/3C/fptrunsafesafe.c → .../test/3C/generated_tests/fptrunsafesafe.c b/clang/test/3C/fptrunsafesafe.c → .../test/3C/generated_tests/fptrunsafesafe.c
diff --git a/clang/test/3C/fptrunsafesafemulti1.c → ...3C/generated_tests/fptrunsafesafemulti1.c b/clang/test/3C/fptrunsafesafemulti1.c → ...3C/generated_tests/fptrunsafesafemulti1.c
diff --git a/clang/test/3C/fptrunsafesafemulti2.c → ...3C/generated_tests/fptrunsafesafemulti2.c b/clang/test/3C/fptrunsafesafemulti2.c → ...3C/generated_tests/fptrunsafesafemulti2.c
diff --git a/clang/test/3C/ptrTOptrboth.c → clang/test/3C/generated_tests/ptrTOptrboth.c b/clang/test/3C/ptrTOptrboth.c → clang/test/3C/generated_tests/ptrTOptrboth.c
diff --git a/clang/test/3C/ptrTOptrbothmulti1.c → ...t/3C/generated_tests/ptrTOptrbothmulti1.c b/clang/test/3C/ptrTOptrbothmulti1.c → ...t/3C/generated_tests/ptrTOptrbothmulti1.c
diff --git a/clang/test/3C/ptrTOptrbothmulti2.c → ...t/3C/generated_tests/ptrTOptrbothmulti2.c b/clang/test/3C/ptrTOptrbothmulti2.c → ...t/3C/generated_tests/ptrTOptrbothmulti2.c
diff --git a/clang/test/3C/ptrTOptrcallee.c → .../test/3C/generated_tests/ptrTOptrcallee.c b/clang/test/3C/ptrTOptrcallee.c → .../test/3C/generated_tests/ptrTOptrcallee.c
diff --git a/clang/test/3C/ptrTOptrcalleemulti1.c → ...3C/generated_tests/ptrTOptrcalleemulti1.c b/clang/test/3C/ptrTOptrcalleemulti1.c → ...3C/generated_tests/ptrTOptrcalleemulti1.c
diff --git a/clang/test/3C/ptrTOptrcalleemulti2.c → ...3C/generated_tests/ptrTOptrcalleemulti2.c b/clang/test/3C/ptrTOptrcalleemulti2.c → ...3C/generated_tests/ptrTOptrcalleemulti2.c
diff --git a/clang/test/3C/ptrTOptrcaller.c → .../test/3C/generated_tests/ptrTOptrcaller.c b/clang/test/3C/ptrTOptrcaller.c → .../test/3C/generated_tests/ptrTOptrcaller.c
diff --git a/clang/test/3C/ptrTOptrcallermulti1.c → ...3C/generated_tests/ptrTOptrcallermulti1.c b/clang/test/3C/ptrTOptrcallermulti1.c → ...3C/generated_tests/ptrTOptrcallermulti1.c
diff --git a/clang/test/3C/ptrTOptrcallermulti2.c → ...3C/generated_tests/ptrTOptrcallermulti2.c b/clang/test/3C/ptrTOptrcallermulti2.c → ...3C/generated_tests/ptrTOptrcallermulti2.c
diff --git a/clang/test/3C/ptrTOptrprotoboth.c → ...st/3C/generated_tests/ptrTOptrprotoboth.c b/clang/test/3C/ptrTOptrprotoboth.c → ...st/3C/generated_tests/ptrTOptrprotoboth.c
diff --git a/clang/test/3C/ptrTOptrprotocallee.c → .../3C/generated_tests/ptrTOptrprotocallee.c b/clang/test/3C/ptrTOptrprotocallee.c → .../3C/generated_tests/ptrTOptrprotocallee.c
diff --git a/clang/test/3C/ptrTOptrprotocaller.c → .../3C/generated_tests/ptrTOptrprotocaller.c b/clang/test/3C/ptrTOptrprotocaller.c → .../3C/generated_tests/ptrTOptrprotocaller.c
diff --git a/clang/test/3C/ptrTOptrprotosafe.c → ...st/3C/generated_tests/ptrTOptrprotosafe.c b/clang/test/3C/ptrTOptrprotosafe.c → ...st/3C/generated_tests/ptrTOptrprotosafe.c
diff --git a/clang/test/3C/ptrTOptrsafe.c → clang/test/3C/generated_tests/ptrTOptrsafe.c b/clang/test/3C/ptrTOptrsafe.c → clang/test/3C/generated_tests/ptrTOptrsafe.c
diff --git a/clang/test/3C/ptrTOptrsafemulti1.c → ...t/3C/generated_tests/ptrTOptrsafemulti1.c b/clang/test/3C/ptrTOptrsafemulti1.c → ...t/3C/generated_tests/ptrTOptrsafemulti1.c
diff --git a/clang/test/3C/ptrTOptrsafemulti2.c → ...t/3C/generated_tests/ptrTOptrsafemulti2.c b/clang/test/3C/ptrTOptrsafemulti2.c → ...t/3C/generated_tests/ptrTOptrsafemulti2.c
diff --git a/clang/test/3C/safefptrargboth.c → ...test/3C/generated_tests/safefptrargboth.c b/clang/test/3C/safefptrargboth.c → ...test/3C/generated_tests/safefptrargboth.c
diff --git a/clang/test/3C/safefptrargbothmulti1.c → ...C/generated_tests/safefptrargbothmulti1.c b/clang/test/3C/safefptrargbothmulti1.c → ...C/generated_tests/safefptrargbothmulti1.c
diff --git a/clang/test/3C/safefptrargbothmulti2.c → ...C/generated_tests/safefptrargbothmulti2.c b/clang/test/3C/safefptrargbothmulti2.c → ...C/generated_tests/safefptrargbothmulti2.c
diff --git a/clang/test/3C/safefptrargcallee.c → ...st/3C/generated_tests/safefptrargcallee.c b/clang/test/3C/safefptrargcallee.c → ...st/3C/generated_tests/safefptrargcallee.c
diff --git a/clang/test/3C/safefptrargcalleemulti1.c → ...generated_tests/safefptrargcalleemulti1.c b/clang/test/3C/safefptrargcalleemulti1.c → ...generated_tests/safefptrargcalleemulti1.c
diff --git a/clang/test/3C/safefptrargcalleemulti2.c → ...generated_tests/safefptrargcalleemulti2.c b/clang/test/3C/safefptrargcalleemulti2.c → ...generated_tests/safefptrargcalleemulti2.c
diff --git a/clang/test/3C/safefptrargcaller.c → ...st/3C/generated_tests/safefptrargcaller.c b/clang/test/3C/safefptrargcaller.c → ...st/3C/generated_tests/safefptrargcaller.c
diff --git a/clang/test/3C/safefptrargcallermulti1.c → ...generated_tests/safefptrargcallermulti1.c b/clang/test/3C/safefptrargcallermulti1.c → ...generated_tests/safefptrargcallermulti1.c
diff --git a/clang/test/3C/safefptrargcallermulti2.c → ...generated_tests/safefptrargcallermulti2.c b/clang/test/3C/safefptrargcallermulti2.c → ...generated_tests/safefptrargcallermulti2.c
diff --git a/clang/test/3C/safefptrargprotoboth.c → ...3C/generated_tests/safefptrargprotoboth.c b/clang/test/3C/safefptrargprotoboth.c → ...3C/generated_tests/safefptrargprotoboth.c
diff --git a/clang/test/3C/safefptrargprotocallee.c → .../generated_tests/safefptrargprotocallee.c b/clang/test/3C/safefptrargprotocallee.c → .../generated_tests/safefptrargprotocallee.c
diff --git a/clang/test/3C/safefptrargprotocaller.c → .../generated_tests/safefptrargprotocaller.c b/clang/test/3C/safefptrargprotocaller.c → .../generated_tests/safefptrargprotocaller.c
diff --git a/clang/test/3C/safefptrargprotosafe.c → ...3C/generated_tests/safefptrargprotosafe.c b/clang/test/3C/safefptrargprotosafe.c → ...3C/generated_tests/safefptrargprotosafe.c
diff --git a/clang/test/3C/safefptrargsafe.c → ...test/3C/generated_tests/safefptrargsafe.c b/clang/test/3C/safefptrargsafe.c → ...test/3C/generated_tests/safefptrargsafe.c
diff --git a/clang/test/3C/safefptrargsafemulti1.c → ...C/generated_tests/safefptrargsafemulti1.c b/clang/test/3C/safefptrargsafemulti1.c → ...C/generated_tests/safefptrargsafemulti1.c
diff --git a/clang/test/3C/safefptrargsafemulti2.c → ...C/generated_tests/safefptrargsafemulti2.c b/clang/test/3C/safefptrargsafemulti2.c → ...C/generated_tests/safefptrargsafemulti2.c
diff --git a/clang/test/3C/unsafefptrargboth.c → ...st/3C/generated_tests/unsafefptrargboth.c b/clang/test/3C/unsafefptrargboth.c → ...st/3C/generated_tests/unsafefptrargboth.c
diff --git a/clang/test/3C/unsafefptrargbothmulti1.c → ...generated_tests/unsafefptrargbothmulti1.c b/clang/test/3C/unsafefptrargbothmulti1.c → ...generated_tests/unsafefptrargbothmulti1.c
diff --git a/clang/test/3C/unsafefptrargbothmulti2.c → ...generated_tests/unsafefptrargbothmulti2.c b/clang/test/3C/unsafefptrargbothmulti2.c → ...generated_tests/unsafefptrargbothmulti2.c
diff --git a/clang/test/3C/unsafefptrargcallee.c → .../3C/generated_tests/unsafefptrargcallee.c b/clang/test/3C/unsafefptrargcallee.c → .../3C/generated_tests/unsafefptrargcallee.c
diff --git a/clang/test/3C/unsafefptrargcalleemulti1.c → ...nerated_tests/unsafefptrargcalleemulti1.c b/clang/test/3C/unsafefptrargcalleemulti1.c → ...nerated_tests/unsafefptrargcalleemulti1.c
diff --git a/clang/test/3C/unsafefptrargcalleemulti2.c → ...nerated_tests/unsafefptrargcalleemulti2.c b/clang/test/3C/unsafefptrargcalleemulti2.c → ...nerated_tests/unsafefptrargcalleemulti2.c
diff --git a/clang/test/3C/unsafefptrargcaller.c → .../3C/generated_tests/unsafefptrargcaller.c b/clang/test/3C/unsafefptrargcaller.c → .../3C/generated_tests/unsafefptrargcaller.c
diff --git a/clang/test/3C/unsafefptrargcallermulti1.c → ...nerated_tests/unsafefptrargcallermulti1.c b/clang/test/3C/unsafefptrargcallermulti1.c → ...nerated_tests/unsafefptrargcallermulti1.c
diff --git a/clang/test/3C/unsafefptrargcallermulti2.c → ...nerated_tests/unsafefptrargcallermulti2.c b/clang/test/3C/unsafefptrargcallermulti2.c → ...nerated_tests/unsafefptrargcallermulti2.c
diff --git a/clang/test/3C/unsafefptrargprotoboth.c → .../generated_tests/unsafefptrargprotoboth.c b/clang/test/3C/unsafefptrargprotoboth.c → .../generated_tests/unsafefptrargprotoboth.c
diff --git a/clang/test/3C/unsafefptrargprotocallee.c → ...enerated_tests/unsafefptrargprotocallee.c b/clang/test/3C/unsafefptrargprotocallee.c → ...enerated_tests/unsafefptrargprotocallee.c
diff --git a/clang/test/3C/unsafefptrargprotocaller.c → ...enerated_tests/unsafefptrargprotocaller.c b/clang/test/3C/unsafefptrargprotocaller.c → ...enerated_tests/unsafefptrargprotocaller.c
diff --git a/clang/test/3C/unsafefptrargprotosafe.c → .../generated_tests/unsafefptrargprotosafe.c b/clang/test/3C/unsafefptrargprotosafe.c → .../generated_tests/unsafefptrargprotosafe.c
diff --git a/clang/test/3C/unsafefptrargsafe.c → ...st/3C/generated_tests/unsafefptrargsafe.c b/clang/test/3C/unsafefptrargsafe.c → ...st/3C/generated_tests/unsafefptrargsafe.c
diff --git a/clang/test/3C/unsafefptrargsafemulti1.c → ...generated_tests/unsafefptrargsafemulti1.c b/clang/test/3C/unsafefptrargsafemulti1.c → ...generated_tests/unsafefptrargsafemulti1.c
diff --git a/clang/test/3C/unsafefptrargsafemulti2.c → ...generated_tests/unsafefptrargsafemulti2.c b/clang/test/3C/unsafefptrargsafemulti2.c → ...generated_tests/unsafefptrargsafemulti2.c
diff --git a/clang/test/3C/processor.py b/clang/test/3C/processor.py
@@ -7,6 +7,10 @@
 import find_bin
 bin_path = find_bin.bin_path
 
+# Change to the subdirectory after calling `find_bin` (which assumes a working
+# directory of `clang/test/3C`) but before doing anything else.
+os.chdir("b_tests")
+
 structs = """\
 struct np {
   int x;

diff --git a/clang/test/3C/testgenerator.py b/clang/test/3C/testgenerator.py
@@ -11,6 +11,16 @@
 import find_bin
 bin_path = find_bin.bin_path
 
+# Change to the subdirectory after calling `find_bin` (which assumes a working
+# directory of `clang/test/3C`) but before doing anything else.
+subdir_name = "generated_tests"
+# Since testgenerator deletes tests under some conditions and Git may delete
+# empty directories, theoretically the directory might not exist and we might
+# need to create it here.
+if not os.path.isdir(subdir_name):
+    os.mkdir(subdir_name)
+os.chdir(subdir_name)
+
 prefixes = [
     "arr", "arrstruct", "arrinstruct", "arrofstruct", "safefptrarg",
     "unsafefptrarg", "fptrsafe", "fptrunsafe", "fptrarr", "fptrarrstruct",