120 files changed, 24 insertions, 24 deletions
diff --git a/compiler-rt/test/asan/TestCases/Linux/aligned_delete_test.cc b/compiler-rt/test/asan/TestCases/Linux/aligned_delete_test.cc
index 9117198f91d..2325242e05a 100644
--- a/compiler-rt/test/asan/TestCases/Linux/aligned_delete_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/aligned_delete_test.cc
@@ -56,7 +56,7 @@ struct alignas(1024) S1024_1024 { char a[1024]; };
 
 int main(int argc, char **argv) {
   // Check the mismatched calls only, all the valid cases are verified in
-  // test/sanitizer_common/TestCases/Linux/new_delete_test.cc.
+  // test/sanitizer_common/TestCases/Linux/new_delete_test.cpp.
 
   operator delete(break_optimization(new S12_128), std::nothrow);
   // CHECK: AddressSanitizer: new-delete-type-mismatch
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc b/compiler-rt/test/sanitizer_common/TestCases/Darwin/abort_on_error.cpp
index e25a676df3a..aa3e1dbd9ed 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Darwin/abort_on_error.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Darwin/abort_on_error.cpp
@@ -1,5 +1,5 @@
 // Check that sanitizers on OS X crash the process by default (i.e.
-// abort_on_error=1). See also Linux/abort_on_error.cc.
+// abort_on_error=1). See also Linux/abort_on_error.cpp.
 
 // RUN: %clangxx -DUSING_%tool_name %s -o %t
 
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Darwin/fputs_puts_null.cc b/compiler-rt/test/sanitizer_common/TestCases/Darwin/fputs_puts_null.cpp
index 705ca2e981c..705ca2e981c 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Darwin/fputs_puts_null.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Darwin/fputs_puts_null.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Darwin/print-stack-trace.cc b/compiler-rt/test/sanitizer_common/TestCases/Darwin/print-stack-trace.cpp
index 715282fd766..e02862d3d41 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Darwin/print-stack-trace.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Darwin/print-stack-trace.cpp
@@ -12,8 +12,8 @@ int main() {
   return 0;
 }
 // CHECK: {{    #0 0x.* in __sanitizer_print_stack_trace}}
-// CHECK: {{    #1 0x.* in FooBarBaz(\(\))? .*}}print-stack-trace.cc:[[@LINE-8]]
-// CHECK: {{    #2 0x.* in main.*}}print-stack-trace.cc:[[@LINE-5]]
+// CHECK: {{    #1 0x.* in FooBarBaz(\(\))? .*}}print-stack-trace.cpp:[[@LINE-8]]
+// CHECK: {{    #2 0x.* in main.*}}print-stack-trace.cpp:[[@LINE-5]]
 
 // CUSTOM: frame:1 lineno:[[@LINE-11]]
 // CUSTOM: frame:2 lineno:[[@LINE-8]]
diff --git a/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/capsicum.cc b/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/capsicum.cpp
index 1bfb6f8d945..1bfb6f8d945 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/capsicum.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/capsicum.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/fdevname.cc b/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/fdevname.cpp
index 252335e9afb..252335e9afb 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/fdevname.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/fdevname.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/abort_on_error.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/abort_on_error.cpp
index e4b246e35f6..d667abcf22b 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/abort_on_error.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/abort_on_error.cpp
@@ -1,5 +1,5 @@
 // Check that sanitizers call _exit() on Linux by default (i.e.
-// abort_on_error=0). See also Darwin/abort_on_error.cc.
+// abort_on_error=0). See also Darwin/abort_on_error.cpp.
 
 // RUN: %clangxx %s -o %t
 
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/aligned_alloc-alignment.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/aligned_alloc-alignment.cpp
index 1a340edecdb..7b119e6a706 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/aligned_alloc-alignment.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/aligned_alloc-alignment.cpp
@@ -31,7 +31,7 @@ int main(int argc, char **argv) {
   // CHECK: {{ERROR: .*Sanitizer: invalid alignment requested in aligned_alloc}}
   // Handle a case when aligned_alloc is aliased by memalign.
   // CHECK: {{#0 .*}}{{aligned_alloc|memalign}}
-  // CHECK: {{#1 .*main .*aligned_alloc-alignment.cc:}}[[@LINE-4]]
+  // CHECK: {{#1 .*main .*aligned_alloc-alignment.cpp:}}[[@LINE-4]]
   // CHECK: {{SUMMARY: .*Sanitizer: invalid-aligned-alloc-alignment}}
 
   // The NULL pointer is printed differently on different systems, while (long)0
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/allow_user_segv.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/allow_user_segv.cpp
index bd58f4bd926..bd58f4bd926 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/allow_user_segv.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/allow_user_segv.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/assert.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/assert.cpp
index 2a73c508844..2a73c508844 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/assert.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/assert.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp
index 8a05f4b6686..8a05f4b6686 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/deepbind.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/deepbind.cpp
index 81150fae977..81150fae977 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/deepbind.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/deepbind.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/getpwnam_r_invalid_user.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/getpwnam_r_invalid_user.cpp
index c0d6cfea1fb..c0d6cfea1fb 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/getpwnam_r_invalid_user.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/getpwnam_r_invalid_user.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/ill.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/ill.cpp
index bbde13b5675..bbde13b5675 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/ill.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/ill.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/mallopt.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/mallopt.cpp
index 9ac3c5dc597..9ac3c5dc597 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/mallopt.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/mallopt.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/mlock_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/mlock_test.cpp
index a952922aaab..a952922aaab 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/mlock_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/mlock_test.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/mprobe.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/mprobe.cpp
index 82c0faf0e2a..82c0faf0e2a 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/mprobe.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/mprobe.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/name_to_handle_at.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/name_to_handle_at.cpp
index e2377107205..e2377107205 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/name_to_handle_at.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/name_to_handle_at.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/new_delete_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/new_delete_test.cpp
index 5e5346a08df..5e5346a08df 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/new_delete_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/new_delete_test.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/open_memstream.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/open_memstream.cpp
index cf31f44be7e..cf31f44be7e 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/open_memstream.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/open_memstream.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/pthread_mutex.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/pthread_mutex.cpp
index 610958143b4..610958143b4 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/pthread_mutex.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/pthread_mutex.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/ptrace.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/ptrace.cpp
index 82532c35fab..82532c35fab 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/ptrace.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/ptrace.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cpp
index 537c57e1a69..c64624389e6 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/pvalloc-overflow.cpp
@@ -35,7 +35,7 @@ int main(int argc, char *argv[]) {
   }
   // CHECK: {{ERROR: .*Sanitizer: pvalloc parameters overflow: size .* rounded up to system page size .* cannot be represented in type size_t}}
   // CHECK: {{#0 .*pvalloc}}
-  // CHECK: {{#1 .*main .*pvalloc-overflow.cc:}}
+  // CHECK: {{#1 .*main .*pvalloc-overflow.cpp:}}
   // CHECK: {{SUMMARY: .*Sanitizer: pvalloc-overflow}}
 
   // The NULL pointer is printed differently on different systems, while (long)0
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/recv_msg_trunc.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/recv_msg_trunc.cpp
index a806ce0f15e..a806ce0f15e 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/recv_msg_trunc.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/recv_msg_trunc.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/sched_getparam.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/sched_getparam.cpp
index 390c656fe20..390c656fe20 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/sched_getparam.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/sched_getparam.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cpp
index d623ccabb5b..d623ccabb5b 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cpp
index 9802617c2d0..9802617c2d0 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cpp
index f7d8b4d6401..f7d8b4d6401 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp
index 0ffb346ebb4..0ffb346ebb4 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/timerfd.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/timerfd.cpp
index e7613bb1d11..e7613bb1d11 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/timerfd.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/timerfd.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/unexpected_format_specifier_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/unexpected_format_specifier_test.cpp
index 641495508ba..641495508ba 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/unexpected_format_specifier_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/unexpected_format_specifier_test.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/asysctl.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/asysctl.cpp
index acdfb17f28b..acdfb17f28b 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/asysctl.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/asysctl.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/cdb.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/cdb.cpp
index 065623b7d7d..065623b7d7d 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/cdb.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/cdb.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/faccessat.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/faccessat.cpp
index ae8be1962b8..ae8be1962b8 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/faccessat.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/faccessat.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/fparseln.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/fparseln.cpp
index 8a71d5fcdad..8a71d5fcdad 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/fparseln.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/fparseln.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/funopen2.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/funopen2.cpp
index 181ad03c991..181ad03c991 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/funopen2.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/funopen2.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgrouplist.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgrouplist.cpp
index 49655542ec6..49655542ec6 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgrouplist.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgrouplist.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgroupmembership.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgroupmembership.cpp
index 025ca9052e6..025ca9052e6 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgroupmembership.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getgroupmembership.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getvfsstat.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getvfsstat.cpp
index ea72e41ede0..ea72e41ede0 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getvfsstat.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/getvfsstat.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/gid_from_group.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/gid_from_group.cpp
index c6a9bc97c1e..c6a9bc97c1e 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/gid_from_group.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/gid_from_group.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/group_from_gid.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/group_from_gid.cpp
index eb39da7b2b5..eb39da7b2b5 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/group_from_gid.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/group_from_gid.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/md2.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/md2.cpp
index 7738aecdf82..7738aecdf82 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/md2.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/md2.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/md4.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/md4.cpp
index a319e89a351..a319e89a351 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/md4.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/md4.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/md5.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/md5.cpp
index aee21681800..aee21681800 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/md5.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/md5.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/mi_vector_hash.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/mi_vector_hash.cpp
index 1f6c1484888..1f6c1484888 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/mi_vector_hash.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/mi_vector_hash.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/netent.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/netent.cpp
index b574a931082..b574a931082 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/netent.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/netent.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/paccept.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/paccept.cpp
index 7d2eb4e8559..7d2eb4e8559 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/paccept.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/paccept.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/protoent.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/protoent.cpp
index c88c6f904a4..c88c6f904a4 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/protoent.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/protoent.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/rmd160.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/rmd160.cpp
index 5b9ff0cb2e1..5b9ff0cb2e1 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/rmd160.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/rmd160.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/sha1.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/sha1.cpp
index ee5060a6601..ee5060a6601 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/sha1.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/sha1.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/sha2.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/sha2.cpp
index e905e3b610f..e905e3b610f 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/sha2.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/sha2.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/statvfs1.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/statvfs1.cpp
index 40dfca37bb5..40dfca37bb5 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/statvfs1.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/statvfs1.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/strmode.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/strmode.cpp
index b8d7d8ccf5a..b8d7d8ccf5a 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/strmode.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/strmode.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/strtoi.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/strtoi.cpp
index 4d0d8b3aebf..4d0d8b3aebf 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/strtoi.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/strtoi.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/sysctlgetmibinfo.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/sysctlgetmibinfo.cpp
index d81c1567fc4..d81c1567fc4 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/sysctlgetmibinfo.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/sysctlgetmibinfo.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/ttyent.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/ttyent.cpp
index 73bc0a5da56..73bc0a5da56 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/ttyent.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/ttyent.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/uid_from_user.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/uid_from_user.cpp
index 4cc1366aad4..4cc1366aad4 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/uid_from_user.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/uid_from_user.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/user_from_uid.cc b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/user_from_uid.cpp
index bb098525a47..bb098525a47 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/user_from_uid.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/user_from_uid.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/access.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/access.cpp
index 8623645f8bd..8623645f8bd 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/access.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/access.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/arc4random.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/arc4random.cpp
index 0a983b58f59..0a983b58f59 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/arc4random.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/arc4random.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/dedup_token_length_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/dedup_token_length_test.cpp
index 94c50be169b..94c50be169b 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/dedup_token_length_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/dedup_token_length_test.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/devname.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/devname.cpp
index 1495f7d9d51..1495f7d9d51 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/devname.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/devname.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/devname_r.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/devname_r.cpp
index ae10a766271..ae10a766271 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/devname_r.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/devname_r.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/dump_instruction_bytes.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/dump_instruction_bytes.cpp
index f42802a3458..f42802a3458 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/dump_instruction_bytes.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/dump_instruction_bytes.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/dump_registers.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/dump_registers.cpp
index 07e87bedc13..07e87bedc13 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/dump_registers.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/dump_registers.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/feof_fileno_ferror.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/feof_fileno_ferror.cpp
index cfcf0e3970a..cfcf0e3970a 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/feof_fileno_ferror.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/feof_fileno_ferror.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/fgetc_ungetc_getc.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/fgetc_ungetc_getc.cpp
index f895cf194ce..f895cf194ce 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/fgetc_ungetc_getc.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/fgetc_ungetc_getc.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/fgetln.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/fgetln.cpp
index b1b4665389a..b1b4665389a 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/fgetln.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/fgetln.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/fgets.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/fgets.cpp
index 6a639f8047d..6a639f8047d 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/fgets.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/fgets.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/fpe.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/fpe.cpp
index c1e785a7ae8..c1e785a7ae8 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/fpe.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/fpe.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/fputc_putc_putchar.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/fputc_putc_putchar.cpp
index 7e786cd9ef3..7e786cd9ef3 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/fputc_putc_putchar.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/fputc_putc_putchar.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/fputs_puts.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/fputs_puts.cpp
index 21bb93aa431..21bb93aa431 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/fputs_puts.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/fputs_puts.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/fseek.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/fseek.cpp
index 26f3b849f4c..26f3b849f4c 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/fseek.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/fseek.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/fts.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/fts.cpp
index 79c41f7de67..79c41f7de67 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/fts.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/fts.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/funopen.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/funopen.cpp
index 7d3192488ec..7d3192488ec 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/funopen.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/funopen.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getc_unlocked.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/getc_unlocked.cpp
index c4257d13042..c4257d13042 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getc_unlocked.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getc_unlocked.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getfsent.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/getfsent.cpp
index 687a7a7d487..687a7a7d487 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getfsent.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getfsent.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getmntinfo.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/getmntinfo.cpp
index 26c065d4dd1..26c065d4dd1 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getmntinfo.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getmntinfo.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cpp
index bf198eff91d..bf198eff91d 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getpass.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getpw_getgr.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/getpw_getgr.cpp
index f4f431e7eb3..f4f431e7eb3 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getpw_getgr.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getpw_getgr.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getusershell.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/getusershell.cpp
index c00d75f1121..c00d75f1121 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getusershell.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getusershell.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_read_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_read_test.cpp
index 9615d7132da..9615d7132da 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_read_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_read_test.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_write_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_write_test.cpp
index 13d1c6a0690..13d1c6a0690 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_write_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/illegal_write_test.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/lstat.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/lstat.cpp
index 01c2ea83d9c..01c2ea83d9c 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/lstat.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/lstat.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/nl_langinfo.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/nl_langinfo.cpp
index b8123542fb8..b8123542fb8 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/nl_langinfo.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/nl_langinfo.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/popen.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/popen.cpp
index 6bf6255a697..6bf6255a697 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/popen.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/popen.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/posix_memalign-alignment.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/posix_memalign-alignment.cpp
index 7729057d2de..0b8e366d247 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/posix_memalign-alignment.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/posix_memalign-alignment.cpp
@@ -35,7 +35,7 @@ int main(int argc, char **argv) {
   int res = posix_memalign(&p, alignment, 100);
   // CHECK: {{ERROR: .*Sanitizer: invalid alignment requested in posix_memalign}}
   // CHECK: {{#0 .*posix_memalign}}
-  // CHECK: {{#1 .*main .*posix_memalign-alignment.cc:}}[[@LINE-3]]
+  // CHECK: {{#1 .*main .*posix_memalign-alignment.cpp:}}[[@LINE-3]]
   // CHECK: {{SUMMARY: .*Sanitizer: invalid-posix-memalign-alignment}}
 
   // The NULL pointer is printed differently on different systems, while (long)0
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/putc_putchar_unlocked.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/putc_putchar_unlocked.cpp
index 12c35c220d9..12c35c220d9 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/putc_putchar_unlocked.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/putc_putchar_unlocked.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cpp
index 3727f01325f..3727f01325f 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/regex.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_death_callback_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_death_callback_test.cpp
index 9c5ae13cfd8..9c5ae13cfd8 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_death_callback_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_death_callback_test.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cpp
index cc7de193f0a..cc7de193f0a 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/sanitizer_set_report_fd_test.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/setvbuf.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/setvbuf.cpp
index bc29ba45d89..bc29ba45d89 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/setvbuf.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/setvbuf.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/sl_add.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/sl_add.cpp
index 4da70c7888f..4da70c7888f 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/sl_add.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/sl_add.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcat.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcat.cpp
index bdabada76aa..bdabada76aa 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcat.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcat.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcpy.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcpy.cpp
index 83053911d96..83053911d96 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcpy.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/strlcpy.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/strtonum.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/strtonum.cpp
index 22346b2e111..22346b2e111 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/strtonum.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/strtonum.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/sysctl.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/sysctl.cpp
index 2cb8764f34b..2cb8764f34b 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/sysctl.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/sysctl.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/vis.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/vis.cpp
index 15f1bc94902..15f1bc94902 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/vis.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/vis.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/weak_hook_test.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/weak_hook_test.cpp
index ba98f47b35e..ba98f47b35e 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/weak_hook_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/weak_hook_test.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/allocator_returns_null.cc b/compiler-rt/test/sanitizer_common/TestCases/allocator_returns_null.cpp
index f5d99174910..f5d99174910 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/allocator_returns_null.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/allocator_returns_null.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/corelimit.cc b/compiler-rt/test/sanitizer_common/TestCases/corelimit.cpp
index 2378a4cfdce..2378a4cfdce 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/corelimit.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/corelimit.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/get_module_and_offset_for_pc.cc b/compiler-rt/test/sanitizer_common/TestCases/get_module_and_offset_for_pc.cpp
index b313df87ce1..694e07f155d 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/get_module_and_offset_for_pc.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/get_module_and_offset_for_pc.cpp
@@ -62,5 +62,5 @@ int main() {
 }
 #endif
 // CHECK: NOT FOUND null: {{.*}}
-// CHECK-NEXT: FOUND callerpc: {{.*}}/get_module_and_offset_for_pc.cc.tmp {{.*}}
+// CHECK-NEXT: FOUND callerpc: {{.*}}/get_module_and_offset_for_pc.cpp.tmp {{.*}}
 // CHECK-NEXT: FOUND foo: {{.*}}/get_module_and_offset_for_pc.so {{.*}}
diff --git a/compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cc b/compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cpp
index e01d416cb80..e01d416cb80 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/malloc_hook.cc b/compiler-rt/test/sanitizer_common/TestCases/malloc_hook.cpp
index 7579ca2c3f9..7579ca2c3f9 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/malloc_hook.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/malloc_hook.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/options-help.cc b/compiler-rt/test/sanitizer_common/TestCases/options-help.cpp
index 913377db70f..913377db70f 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/options-help.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/options-help.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/options-include.cc b/compiler-rt/test/sanitizer_common/TestCases/options-include.cpp
index 3d9127b7f23..075c6737c82 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/options-include.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/options-include.cpp
@@ -4,7 +4,7 @@
 // RUN: echo "symbolize=1" > %t.options1.txt
 // RUN: echo "include='%t.options2.txt'" >>%t.options1.txt
 // RUN: echo "help=1" >%t.options2.txt
-// RUN: echo "help=1" >%t.options.options-include.cc.tmp
+// RUN: echo "help=1" >%t.options.options-include.cpp.tmp
 // RUN: cat %t.options1.txt
 // RUN: cat %t.options2.txt
 
diff --git a/compiler-rt/test/sanitizer_common/TestCases/options-invalid.cc b/compiler-rt/test/sanitizer_common/TestCases/options-invalid.cpp
index 572c4912cfd..572c4912cfd 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/options-invalid.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/options-invalid.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/print-stack-trace.cc b/compiler-rt/test/sanitizer_common/TestCases/print-stack-trace.cpp
index e4b8ad2bb2c..0c0bdc03dac 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/print-stack-trace.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/print-stack-trace.cpp
@@ -19,11 +19,11 @@ int main() {
   return 0;
 }
 // CHECK: {{    #0 0x.* in __sanitizer_print_stack_trace}}
-// CHECK: {{    #1 0x.* in FooBarBaz(\(\))? .*}}print-stack-trace.cc:[[@LINE-8]]
-// CHECK: {{    #2 0x.* in main.*}}print-stack-trace.cc:[[@LINE-5]]
+// CHECK: {{    #1 0x.* in FooBarBaz(\(\))? .*}}print-stack-trace.cpp:[[@LINE-8]]
+// CHECK: {{    #2 0x.* in main.*}}print-stack-trace.cpp:[[@LINE-5]]
 
 // CUSTOM: frame1_lineno[[@LINE-11]]
 // CUSTOM: frame2_lineno[[@LINE-8]]
 
 // NOINLINE: #0 0x{{.*}} in __sanitizer_print_stack_trace
-// NOINLINE: #1 0x{{.*}} in main{{.*}}print-stack-trace.cc:[[@LINE-15]]
+// NOINLINE: #1 0x{{.*}} in main{{.*}}print-stack-trace.cpp:[[@LINE-15]]
diff --git a/compiler-rt/test/sanitizer_common/TestCases/pthread_mutexattr_get.cc b/compiler-rt/test/sanitizer_common/TestCases/pthread_mutexattr_get.cpp
index 742ae72c41b..742ae72c41b 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/pthread_mutexattr_get.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/pthread_mutexattr_get.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/reallocarray-overflow.cc b/compiler-rt/test/sanitizer_common/TestCases/reallocarray-overflow.cpp
index 245a5b47ab2..245a5b47ab2 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/reallocarray-overflow.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/reallocarray-overflow.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_inline8bit_counter.cc b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_inline8bit_counter.cpp
index 58a64d1a92d..58a64d1a92d 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_inline8bit_counter.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_inline8bit_counter.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cc b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cpp
index 9604da222f8..9604da222f8 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_no_prune.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_stack_depth.cc b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_stack_depth.cpp
index 90959ef5b02..90959ef5b02 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_stack_depth.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_stack_depth.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_symbolize.cc b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_symbolize.cpp
index daa994c8116..daa994c8116 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_symbolize.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_symbolize.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cc b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cpp
index 7a2eca8bcd9..3316c5d72fb 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cpp
@@ -70,5 +70,5 @@ int baz() {
 //
 // CHECK-SANCOV: Ignoring {{.*}}_1.so and its coverage because __sanitizer_cov* functions were not found.
 // CHECK-SANCOV: Ignoring {{.*}}_2.so and its coverage because __sanitizer_cov* functions were not found.
-// CHECK-SANCOV-NEXT: sanitizer_coverage_trace_pc_guard-dso.cc:[[@LINE-42]] foo
-// CHECK-SANCOV-NEXT: sanitizer_coverage_trace_pc_guard-dso.cc:[[@LINE-38]] main
+// CHECK-SANCOV-NEXT: sanitizer_coverage_trace_pc_guard-dso.cpp:[[@LINE-42]] foo
+// CHECK-SANCOV-NEXT: sanitizer_coverage_trace_pc_guard-dso.cpp:[[@LINE-38]] main
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-init.cc b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-init.cpp
index b92a513b6d6..b92a513b6d6 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-init.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-init.cpp
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cc b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp
index 5e01a803bff..b151fc247dc 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp
@@ -35,7 +35,7 @@ int main() {
 // CHECK-NEXT: foo
 // CHECK-NEXT: SanitizerCoverage: ./sanitizer_coverage_trace_pc_guard.{{.*}}.sancov: 2 PCs written
 //
-// CHECK-SANCOV: sanitizer_coverage_trace_pc_guard.cc:[[@LINE-16]] foo
-// CHECK-SANCOV-NEXT: sanitizer_coverage_trace_pc_guard.cc:[[@LINE-12]] main
+// CHECK-SANCOV: sanitizer_coverage_trace_pc_guard.cpp:[[@LINE-16]] foo
+// CHECK-SANCOV-NEXT: sanitizer_coverage_trace_pc_guard.cpp:[[@LINE-12]] main
 //
 // CHECK-NOCOV-NOT: SanitizerCoverage
diff --git a/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cc b/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cpp
index 16a81f1bbd4..4cea49f33ce 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cpp
@@ -48,8 +48,8 @@ int main() {
   // CHECK: PARTIAL '0x{{.*}}'
   SymbolizeSmallBuffer();
 
-  // CHECK: FIRST_FORMAT 0x{{.*}} in main symbolize_pc.cc:[[@LINE+2]]
-  // CHECK: SECOND_FORMAT FUNC:main LINE:[[@LINE+1]] FILE:symbolize_pc.cc
+  // CHECK: FIRST_FORMAT 0x{{.*}} in main symbolize_pc.cpp:[[@LINE+2]]
+  // CHECK: SECOND_FORMAT FUNC:main LINE:[[@LINE+1]] FILE:symbolize_pc.cpp
   SymbolizeCaller();
 
   // CHECK: GLOBAL: GLOBAL_VAR_ABC
diff --git a/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc_inline.cc b/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc_inline.cpp
index 9589a3af076..9567103155f 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc_inline.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc_inline.cpp
@@ -18,15 +18,15 @@ __attribute__((noinline)) static void Symbolize() {
     printf("%s\n", p);
 }
 
-// CHECK-NOINLINE: {{0x[0-9a-f]+}} in main symbolize_pc_inline.cc:[[@LINE+2]]
-// CHECK: [[ADDR:0x[0-9a-f]+]] in C2 symbolize_pc_inline.cc:[[@LINE+1]]
+// CHECK-NOINLINE: {{0x[0-9a-f]+}} in main symbolize_pc_inline.cpp:[[@LINE+2]]
+// CHECK: [[ADDR:0x[0-9a-f]+]] in C2 symbolize_pc_inline.cpp:[[@LINE+1]]
 static inline void C2() { Symbolize(); }
 
-// CHECK: [[ADDR]] in C3 symbolize_pc_inline.cc:[[@LINE+1]]
+// CHECK: [[ADDR]] in C3 symbolize_pc_inline.cpp:[[@LINE+1]]
 static inline void C3() { C2(); }
 
-// CHECK: [[ADDR]] in C4 symbolize_pc_inline.cc:[[@LINE+1]]
+// CHECK: [[ADDR]] in C4 symbolize_pc_inline.cpp:[[@LINE+1]]
 static inline void C4() { C3(); }
 
-// CHECK: [[ADDR]] in main symbolize_pc_inline.cc:[[@LINE+1]]
+// CHECK: [[ADDR]] in main symbolize_pc_inline.cpp:[[@LINE+1]]
 int main() { C4(); }
diff --git a/compiler-rt/test/sanitizer_common/TestCases/symbolize_stack.cc b/compiler-rt/test/sanitizer_common/TestCases/symbolize_stack.cpp
index d6ec49b407f..d6ec49b407f 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/symbolize_stack.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/symbolize_stack.cpp