13 files changed, 6 insertions, 6 deletions
diff --git a/compiler-rt/test/hwasan/TestCases/abort-message-android.cc b/compiler-rt/test/hwasan/TestCases/abort-message-android.cpp
index f89b929d454..f89b929d454 100644
--- a/compiler-rt/test/hwasan/TestCases/abort-message-android.cc
+++ b/compiler-rt/test/hwasan/TestCases/abort-message-android.cpp
diff --git a/compiler-rt/test/hwasan/TestCases/allocator_returns_null.cc b/compiler-rt/test/hwasan/TestCases/allocator_returns_null.cpp
index 8d2ef38d4ab..8d2ef38d4ab 100644
--- a/compiler-rt/test/hwasan/TestCases/allocator_returns_null.cc
+++ b/compiler-rt/test/hwasan/TestCases/allocator_returns_null.cpp
diff --git a/compiler-rt/test/hwasan/TestCases/cfi.cc b/compiler-rt/test/hwasan/TestCases/cfi.cpp
index e64b556171e..e64b556171e 100644
--- a/compiler-rt/test/hwasan/TestCases/cfi.cc
+++ b/compiler-rt/test/hwasan/TestCases/cfi.cpp
diff --git a/compiler-rt/test/hwasan/TestCases/check-interface.cc b/compiler-rt/test/hwasan/TestCases/check-interface.cpp
index 7ad91148035..7ad91148035 100644
--- a/compiler-rt/test/hwasan/TestCases/check-interface.cc
+++ b/compiler-rt/test/hwasan/TestCases/check-interface.cpp
diff --git a/compiler-rt/test/hwasan/TestCases/halt-on-error.cc b/compiler-rt/test/hwasan/TestCases/halt-on-error.cpp
index fdf6d27d793..3a7abdd3b74 100644
--- a/compiler-rt/test/hwasan/TestCases/halt-on-error.cc
+++ b/compiler-rt/test/hwasan/TestCases/halt-on-error.cpp
@@ -27,15 +27,15 @@ int main() {
   return x[2] + ((char *)x)[6] + ((char *)x)[9];
   // COMMON: READ of size 4 at
   // When instrumenting with callbacks, main is actually #1, and #0 is __hwasan_load4.
-  // COMMON: #{{.*}} in main {{.*}}halt-on-error.cc:27
+  // COMMON: #{{.*}} in main {{.*}}halt-on-error.cpp:27
   // COMMON: SUMMARY: HWAddressSanitizer: tag-mismatch {{.*}} in
 
   // RECOVER: READ of size 1 at
-  // RECOVER: #{{.*}} in main {{.*}}halt-on-error.cc:27
+  // RECOVER: #{{.*}} in main {{.*}}halt-on-error.cpp:27
   // RECOVER: SUMMARY: HWAddressSanitizer: tag-mismatch {{.*}} in
 
   // RECOVER: READ of size 1 at
-  // RECOVER: #{{.*}} in main {{.*}}halt-on-error.cc:27
+  // RECOVER: #{{.*}} in main {{.*}}halt-on-error.cpp:27
   // RECOVER: SUMMARY: HWAddressSanitizer: tag-mismatch {{.*}} in
 
   // COMMON-NOT: tag-mismatch
diff --git a/compiler-rt/test/hwasan/TestCases/hwasan-print-shadow.cc b/compiler-rt/test/hwasan/TestCases/hwasan-print-shadow.cpp
index fa6330bbccc..fa6330bbccc 100644
--- a/compiler-rt/test/hwasan/TestCases/hwasan-print-shadow.cc
+++ b/compiler-rt/test/hwasan/TestCases/hwasan-print-shadow.cpp
diff --git a/compiler-rt/test/hwasan/TestCases/malloc_fill.cc b/compiler-rt/test/hwasan/TestCases/malloc_fill.cpp
index b8513b7e2b7..b8513b7e2b7 100644
--- a/compiler-rt/test/hwasan/TestCases/malloc_fill.cc
+++ b/compiler-rt/test/hwasan/TestCases/malloc_fill.cpp
diff --git a/compiler-rt/test/hwasan/TestCases/new-test.cc b/compiler-rt/test/hwasan/TestCases/new-test.cpp
index 3b1991e4dea..3b1991e4dea 100644
--- a/compiler-rt/test/hwasan/TestCases/new-test.cc
+++ b/compiler-rt/test/hwasan/TestCases/new-test.cpp
diff --git a/compiler-rt/test/hwasan/TestCases/realloc-test.cc b/compiler-rt/test/hwasan/TestCases/realloc-test.cpp
index 136346f57c2..136346f57c2 100644
--- a/compiler-rt/test/hwasan/TestCases/realloc-test.cc
+++ b/compiler-rt/test/hwasan/TestCases/realloc-test.cpp
diff --git a/compiler-rt/test/hwasan/TestCases/register-dump-no-fp.cc b/compiler-rt/test/hwasan/TestCases/register-dump-no-fp.cpp
index 1a14cab0aa6..8fff9876a64 100644
--- a/compiler-rt/test/hwasan/TestCases/register-dump-no-fp.cc
+++ b/compiler-rt/test/hwasan/TestCases/register-dump-no-fp.cpp
@@ -16,7 +16,7 @@
 __attribute__((noinline)) void f(int *p) { *p = 3; }
 
 // CHECK: ERROR: HWAddressSanitizer:
-// CHECK: #0 {{.*}} in f(int*) {{.*}}register-dump-no-fp.cc:[[@LINE-3]]
+// CHECK: #0 {{.*}} in f(int*) {{.*}}register-dump-no-fp.cpp:[[@LINE-3]]
 
 int main() {
   __hwasan_enable_allocator_tagging();
@@ -24,5 +24,5 @@ int main() {
   int *volatile a = new int;
   a = (int *)__hwasan_tag_pointer(a, 0);
   f(a);
-  // CHECK: #1 {{.*}} in main {{.*}}register-dump-no-fp.cc:[[@LINE-1]]
+  // CHECK: #1 {{.*}} in main {{.*}}register-dump-no-fp.cpp:[[@LINE-1]]
 }
diff --git a/compiler-rt/test/hwasan/TestCases/sanitizer_malloc.cc b/compiler-rt/test/hwasan/TestCases/sanitizer_malloc.cpp
index cf1dc0741be..cf1dc0741be 100644
--- a/compiler-rt/test/hwasan/TestCases/sanitizer_malloc.cc
+++ b/compiler-rt/test/hwasan/TestCases/sanitizer_malloc.cpp
diff --git a/compiler-rt/test/hwasan/TestCases/try-catch.cc b/compiler-rt/test/hwasan/TestCases/try-catch.cpp
index df1f93d2bae..df1f93d2bae 100644
--- a/compiler-rt/test/hwasan/TestCases/try-catch.cc
+++ b/compiler-rt/test/hwasan/TestCases/try-catch.cpp
diff --git a/compiler-rt/test/hwasan/lit.cfg.py b/compiler-rt/test/hwasan/lit.cfg.py
index b9f98208171..d4f8a46e1cc 100644
--- a/compiler-rt/test/hwasan/lit.cfg.py
+++ b/compiler-rt/test/hwasan/lit.cfg.py
@@ -30,7 +30,7 @@ config.substitutions.append(('%env_hwasan_opts=',
                              'env HWASAN_OPTIONS=' + default_hwasan_opts_str))
 
 # Default test suffixes.
-config.suffixes = ['.c', '.cc', '.cpp']
+config.suffixes = ['.c', '.cpp']
 
 if config.host_os not in ['Linux', 'Android']:
   config.unsupported = True