summaryrefslogtreecommitdiffstats
path: root/clang/test/Parser/attr-availability.c
diff options
context:
space:
mode:
authorRichard Trieu <rtrieu@google.com>2011-12-15 00:38:15 +0000
committerRichard Trieu <rtrieu@google.com>2011-12-15 00:38:15 +0000
commit553b2b2e5dde2839618edbc7b60f6c0677774853 (patch)
tree939113f97b1097c1629ec5d75d3b84be7e3b6582 /clang/test/Parser/attr-availability.c
parent0b144e160a3129708d1494e88d614cdce2867160 (diff)
downloadbcm5719-llvm-553b2b2e5dde2839618edbc7b60f6c0677774853.tar.gz
bcm5719-llvm-553b2b2e5dde2839618edbc7b60f6c0677774853.zip
Modify how the -verify flag works. Currently, the verification string and
diagnostic message are compared. If either is a substring of the other, then no error is given. This gives rise to an unexpected case: // expect-error{{candidate function has different number of parameters}} will match the following error messages from Clang: candidate function has different number of parameters (expected 1 but has 2) candidate function has different number of parameters It will also match these other error messages: candidate function function has different number of parameters number of parameters This patch will change so that the verification string must be a substring of the diagnostic message before accepting. Also, all the failing tests from this change have been corrected. Some stats from this cleanup: 87 - removed extra spaces around verification strings 70 - wording updates to diagnostics 40 - extra leading or trailing characters (typos, unmatched parens or quotes) 35 - diagnostic level was included (error:, warning:, or note:) 18 - flag name put in the warning (-Wprotocol) llvm-svn: 146619
Diffstat (limited to 'clang/test/Parser/attr-availability.c')
-rw-r--r--clang/test/Parser/attr-availability.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/Parser/attr-availability.c b/clang/test/Parser/attr-availability.c
index 7b00f06ca52..b9ff31c811c 100644
--- a/clang/test/Parser/attr-availability.c
+++ b/clang/test/Parser/attr-availability.c
@@ -16,7 +16,7 @@ void f4() __attribute__((availability(macosx,introduced=10.5), availability(ios,
void f5() __attribute__((availability(macosx,introduced=10.5), availability(ios,unavailable, unavailable))); // expected-error{{redundant 'unavailable' availability change; only the last specified change will be used}}
-void f6() __attribute__((availability(macosx,unavailable,introduced=10.5))); // expected-warning{{warning: 'unavailable' availability overrides all other availability information}}
+void f6() __attribute__((availability(macosx,unavailable,introduced=10.5))); // expected-warning{{'unavailable' availability overrides all other availability information}}
// rdar://10095131
enum E{
OpenPOWER on IntegriCloud