summaryrefslogtreecommitdiffstats
path: root/clang/test
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2015-11-14 02:09:55 +0000
committerCraig Topper <craig.topper@gmail.com>2015-11-14 02:09:55 +0000
commit7f5ff2175f68859e71ba2324190c8f0c8c3942e7 (patch)
tree9d05c971090f326cb2dd8037f897b54e41a2e138 /clang/test
parent39db7260937be4ddbfc5f538a14146f43dc17299 (diff)
downloadbcm5719-llvm-7f5ff2175f68859e71ba2324190c8f0c8c3942e7.tar.gz
bcm5719-llvm-7f5ff2175f68859e71ba2324190c8f0c8c3942e7.zip
Use %select to merge similar diagnostics. NFC
llvm-svn: 253119
Diffstat (limited to 'clang/test')
-rw-r--r--clang/test/Misc/warning-flags-enabled.c2
-rw-r--r--clang/test/Misc/warning-flags.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/clang/test/Misc/warning-flags-enabled.c b/clang/test/Misc/warning-flags-enabled.c
index ba29e7ac51a..b809465a0eb 100644
--- a/clang/test/Misc/warning-flags-enabled.c
+++ b/clang/test/Misc/warning-flags-enabled.c
@@ -3,7 +3,7 @@
// This shows warnings which are on by default.
// We just check a few to make sure it's doing something sensible.
//
-// CHECK: ext_unterminated_string
+// CHECK: ext_unterminated_char_or_string
// CHECK: warn_condition_is_assignment
// CHECK: warn_null_arg
diff --git a/clang/test/Misc/warning-flags.c b/clang/test/Misc/warning-flags.c
index 5cc769faad9..69e820542ab 100644
--- a/clang/test/Misc/warning-flags.c
+++ b/clang/test/Misc/warning-flags.c
@@ -18,7 +18,7 @@ This test serves two purposes:
The list of warnings below should NEVER grow. It should gradually shrink to 0.
-CHECK: Warnings without flags (85):
+CHECK: Warnings without flags (84):
CHECK-NEXT: ext_excess_initializers
CHECK-NEXT: ext_excess_initializers_in_char_array_initializer
CHECK-NEXT: ext_expected_semi_decl_list
@@ -84,8 +84,7 @@ CHECK-NEXT: warn_objc_property_copy_missing_on_block
CHECK-NEXT: warn_objc_protocol_qualifier_missing_id
CHECK-NEXT: warn_on_superclass_use
CHECK-NEXT: warn_partial_specs_not_deducible
-CHECK-NEXT: warn_pp_convert_lhs_to_positive
-CHECK-NEXT: warn_pp_convert_rhs_to_positive
+CHECK-NEXT: warn_pp_convert_to_positive
CHECK-NEXT: warn_pp_expr_overflow
CHECK-NEXT: warn_pp_line_decimal
CHECK-NEXT: warn_pragma_pack_pop_identifer_and_alignment
OpenPOWER on IntegriCloud