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)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@146619 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Lexer/string-literal-encoding.c b/test/Lexer/string-literal-encoding.c
index de28af2..c92f7bb 100644
--- a/test/Lexer/string-literal-encoding.c
+++ b/test/Lexer/string-literal-encoding.c
@@ -5,11 +5,11 @@
// U+00F5 U+00FC
void f() {
- wchar_t const *a = L"Àéîõü"; // expected-error {{ illegal sequence in string literal }}
+ wchar_t const *a = L"Àéîõü"; // expected-error {{illegal sequence in string literal}}
- char16_t const *b = u"Àéîõü"; // expected-error {{ illegal sequence in string literal }}
- char32_t const *c = U"Àéîõü"; // expected-error {{ illegal sequence in string literal }}
- wchar_t const *d = LR"(Àéîõü)"; // expected-error {{ illegal sequence in string literal }}
- char16_t const *e = uR"(Àéîõü)"; // expected-error {{ illegal sequence in string literal }}
- char32_t const *f = UR"(Àéîõü)"; // expected-error {{ illegal sequence in string literal }}
+ char16_t const *b = u"Àéîõü"; // expected-error {{illegal sequence in string literal}}
+ char32_t const *c = U"Àéîõü"; // expected-error {{illegal sequence in string literal}}
+ wchar_t const *d = LR"(Àéîõü)"; // expected-error {{illegal sequence in string literal}}
+ char16_t const *e = uR"(Àéîõü)"; // expected-error {{illegal sequence in string literal}}
+ char32_t const *f = UR"(Àéîõü)"; // expected-error {{illegal sequence in string literal}}
}