9 files changed, 22 insertions, 22 deletions
diff --git a/clang-tools-extra/test/clang-tidy/misc-suspicious-semicolon-fail.cpp b/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon-fail.cpp
index e4e7ae5cf92..db270d8c21d 100644
--- a/clang-tools-extra/test/clang-tidy/misc-suspicious-semicolon-fail.cpp
+++ b/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon-fail.cpp
@@ -1,7 +1,7 @@
-// RUN: clang-tidy %s -checks="-*,misc-suspicious-semicolon" -- -DERROR 2>&1 \
+// RUN: clang-tidy %s -checks="-*,bugprone-suspicious-semicolon" -- -DERROR 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=CHECK-ERROR \
 // RUN:       -implicit-check-not="{{warning|error}}:"
-// RUN: clang-tidy %s -checks="-*,misc-suspicious-semicolon,clang-diagnostic*" \
+// RUN: clang-tidy %s -checks="-*,bugprone-suspicious-semicolon,clang-diagnostic*" \
 // RUN:    -- -DWERROR -Wno-everything -Werror=unused-variable 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=CHECK-WERROR \
 // RUN:       -implicit-check-not="{{warning|error}}:"
@@ -13,7 +13,7 @@ bool g();
 
 void f() {
   if (g());
-  // CHECK-WERROR: :[[@LINE-1]]:11: warning: potentially unintended semicolon [misc-suspicious-semicolon]
+  // CHECK-WERROR: :[[@LINE-1]]:11: warning: potentially unintended semicolon [bugprone-suspicious-semicolon]
 #if ERROR
   int a
   // CHECK-ERROR: :[[@LINE-1]]:8: error: expected ';' at end of declaration [clang-diagnostic-error]
diff --git a/clang-tools-extra/test/clang-tidy/misc-suspicious-semicolon.cpp b/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon.cpp
index 77da2c9f3a6..4f9f4c5db65 100644
--- a/clang-tools-extra/test/clang-tidy/misc-suspicious-semicolon.cpp
+++ b/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s misc-suspicious-semicolon %t
+// RUN: %check_clang_tidy %s bugprone-suspicious-semicolon %t
 
 int x = 5;
 
@@ -26,7 +26,7 @@ void correct3()
 void fail1()
 {
   if(x > 5); nop();
-  // CHECK-MESSAGES: :[[@LINE-1]]:12: warning: potentially unintended semicolon [misc-suspicious-semicolon]
+  // CHECK-MESSAGES: :[[@LINE-1]]:12: warning: potentially unintended semicolon [bugprone-suspicious-semicolon]
   // CHECK-FIXES: if(x > 5) nop();
 }
 
@@ -34,7 +34,7 @@ void fail2()
 {
 	if(x == 5);
 		nop();
-  // CHECK-MESSAGES: :[[@LINE-2]]:12: warning: potentially unintended semicolon [misc-suspicious-semicolon]
+  // CHECK-MESSAGES: :[[@LINE-2]]:12: warning: potentially unintended semicolon [bugprone-suspicious-semicolon]
   // CHECK-FIXES: if(x == 5){{$}}
 }
 
diff --git a/clang-tools-extra/test/clang-tidy/misc-suspicious-string-compare.c b/clang-tools-extra/test/clang-tidy/bugprone-suspicious-string-compare.c
index d1dbf9eff9f..3b3175ab958 100644
--- a/clang-tools-extra/test/clang-tidy/misc-suspicious-string-compare.c
+++ b/clang-tools-extra/test/clang-tidy/bugprone-suspicious-string-compare.c
@@ -1,7 +1,7 @@
-// RUN: %check_clang_tidy %s misc-suspicious-string-compare %t -- \
+// RUN: %check_clang_tidy %s bugprone-suspicious-string-compare %t -- \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: misc-suspicious-string-compare.WarnOnImplicitComparison, value: 1}, \
-// RUN:   {key: misc-suspicious-string-compare.WarnOnLogicalNotComparison, value: 1}]}' \
+// RUN:  [{key: bugprone-suspicious-string-compare.WarnOnImplicitComparison, value: 1}, \
+// RUN:   {key: bugprone-suspicious-string-compare.WarnOnLogicalNotComparison, value: 1}]}' \
 // RUN: -- -std=c99
 
 static const char A[] = "abc";
@@ -11,7 +11,7 @@ int strcmp(const char *, const char *);
 int test_warning_patterns() {
   if (strcmp(A, "a"))
     return 0;
-  // CHECK-MESSAGES: [[@LINE-2]]:7: warning: function 'strcmp' is called without explicitly comparing result [misc-suspicious-string-compare]
+  // CHECK-MESSAGES: [[@LINE-2]]:7: warning: function 'strcmp' is called without explicitly comparing result [bugprone-suspicious-string-compare]
   // CHECK-FIXES: if (strcmp(A, "a") != 0)
 
   if (strcmp(A, "a") != 0 ||
diff --git a/clang-tools-extra/test/clang-tidy/misc-suspicious-string-compare.cpp b/clang-tools-extra/test/clang-tidy/bugprone-suspicious-string-compare.cpp
index 4c51676ded3..c1c24ffcd44 100644
--- a/clang-tools-extra/test/clang-tidy/misc-suspicious-string-compare.cpp
+++ b/clang-tools-extra/test/clang-tidy/bugprone-suspicious-string-compare.cpp
@@ -1,7 +1,7 @@
-// RUN: %check_clang_tidy %s misc-suspicious-string-compare %t -- \
+// RUN: %check_clang_tidy %s bugprone-suspicious-string-compare %t -- \
 // RUN: -config='{CheckOptions: \
-// RUN:  [{key: misc-suspicious-string-compare.WarnOnImplicitComparison, value: 1}, \
-// RUN:   {key: misc-suspicious-string-compare.WarnOnLogicalNotComparison, value: 1}]}' \
+// RUN:  [{key: bugprone-suspicious-string-compare.WarnOnImplicitComparison, value: 1}, \
+// RUN:   {key: bugprone-suspicious-string-compare.WarnOnLogicalNotComparison, value: 1}]}' \
 // RUN: --
 
 typedef __SIZE_TYPE__ size;
@@ -61,7 +61,7 @@ int _mbsnbicmp_l(const unsigned char *, const unsigned char *, size, locale_t);
 int test_warning_patterns() {
   if (strcmp(A, "a"))
     return 0;
-  // CHECK-MESSAGES: [[@LINE-2]]:7: warning: function 'strcmp' is called without explicitly comparing result [misc-suspicious-string-compare]
+  // CHECK-MESSAGES: [[@LINE-2]]:7: warning: function 'strcmp' is called without explicitly comparing result [bugprone-suspicious-string-compare]
   // CHECK-FIXES: if (strcmp(A, "a") != 0)
 
   if (strcmp(A, "a") == 0 ||
diff --git a/clang-tools-extra/test/clang-tidy/misc-swapped-arguments.cpp b/clang-tools-extra/test/clang-tidy/bugprone-swapped-arguments.cpp
index 4f1f0ea3d3b..06fb2d869f6 100644
--- a/clang-tools-extra/test/clang-tidy/misc-swapped-arguments.cpp
+++ b/clang-tools-extra/test/clang-tidy/bugprone-swapped-arguments.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s misc-swapped-arguments %t
+// RUN: %check_clang_tidy %s bugprone-swapped-arguments %t
 
 void F(int, double);
 
diff --git a/clang-tools-extra/test/clang-tidy/misc-undelegated-constructor-cxx98.cpp b/clang-tools-extra/test/clang-tidy/bugprone-undelegated-constructor-cxx98.cpp
index 78b53bb7840..f859f24dd7b 100644
--- a/clang-tools-extra/test/clang-tidy/misc-undelegated-constructor-cxx98.cpp
+++ b/clang-tools-extra/test/clang-tidy/bugprone-undelegated-constructor-cxx98.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-tidy %s -checks=-*,misc-undelegated-constructor -- -std=c++98 | count 0
+// RUN: clang-tidy %s -checks=-*,bugprone-undelegated-constructor -- -std=c++98 | count 0
 
 // Note: this test expects no diagnostics, but FileCheck cannot handle that,
 // hence the use of | count 0.
diff --git a/clang-tools-extra/test/clang-tidy/misc-undelegated-constructor.cpp b/clang-tools-extra/test/clang-tidy/bugprone-undelegated-constructor.cpp
index 1b5e3c4c641..09b20ac74e2 100644
--- a/clang-tools-extra/test/clang-tidy/misc-undelegated-constructor.cpp
+++ b/clang-tools-extra/test/clang-tidy/bugprone-undelegated-constructor.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s misc-undelegated-constructor %t
+// RUN: %check_clang_tidy %s bugprone-undelegated-constructor %t
 
 struct Ctor;
 Ctor foo();
@@ -9,7 +9,7 @@ struct Ctor {
   Ctor(int, int);
   Ctor(Ctor *i) {
     Ctor();
-// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: did you intend to call a delegated constructor? A temporary object is created here instead [misc-undelegated-constructor]
+// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: did you intend to call a delegated constructor? A temporary object is created here instead [bugprone-undelegated-constructor]
     Ctor(0);
 // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: did you intend to call a delegated constructor?
     Ctor(1, 2);
diff --git a/clang-tools-extra/test/clang-tidy/objc-arc-and-properties.m b/clang-tools-extra/test/clang-tidy/objc-arc-and-properties.m
index 2626e8b142b..7fbd7963b44 100644
--- a/clang-tools-extra/test/clang-tidy/objc-arc-and-properties.m
+++ b/clang-tools-extra/test/clang-tidy/objc-arc-and-properties.m
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s misc-suspicious-semicolon %t
+// RUN: %check_clang_tidy %s bugprone-suspicious-semicolon %t
 
 // This test checks if Objective-C 2.0 (@properties) and
 // Automatic Reference Counting (ARC) are enabled for .m files
@@ -16,6 +16,6 @@
 void fail(Foo *f)
 {
   if(f.shouldDoStuff); [f nop];
-  // CHECK-MESSAGES: :[[@LINE-1]]:22: warning: potentially unintended semicolon [misc-suspicious-semicolon]
+  // CHECK-MESSAGES: :[[@LINE-1]]:22: warning: potentially unintended semicolon [bugprone-suspicious-semicolon]
   // CHECK-FIXES: if(f.shouldDoStuff) [f nop];
 }
diff --git a/clang-tools-extra/test/clang-tidy/objc-no-arc-or-properties.m b/clang-tools-extra/test/clang-tidy/objc-no-arc-or-properties.m
index db8b1bf2f2f..c1e73edeb86 100644
--- a/clang-tools-extra/test/clang-tidy/objc-no-arc-or-properties.m
+++ b/clang-tools-extra/test/clang-tidy/objc-no-arc-or-properties.m
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s misc-suspicious-semicolon %t -- -- -fno-objc-arc -fobjc-abi-version=1
+// RUN: %check_clang_tidy %s bugprone-suspicious-semicolon %t -- -- -fno-objc-arc -fobjc-abi-version=1
 
 // This test ensures check_clang_tidy.py allows disabling Objective-C ARC and
 // Objective-C 2.0 via passing arguments after -- on the command line.
@@ -24,6 +24,6 @@
 void fail(Foo *f)
 {
   if([f shouldDoStuff]); [f nop];
-  // CHECK-MESSAGES: :[[@LINE-1]]:24: warning: potentially unintended semicolon [misc-suspicious-semicolon]
+  // CHECK-MESSAGES: :[[@LINE-1]]:24: warning: potentially unintended semicolon [bugprone-suspicious-semicolon]
   // CHECK-FIXES: if([f shouldDoStuff]) [f nop];
 }