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

2 files changed, 49 insertions, 1 deletions

diff --git a/test/Misc/diag-aka-types.cpp b/test/Misc/diag-aka-types.cpp
index 7459bc5c65..4c9a7312cd 100644
--- a/test/Misc/diag-aka-types.cpp
+++ b/test/Misc/diag-aka-types.cpp
@@ -27,7 +27,7 @@ namespace bar {
 }
 
 void test(Foo::foo* x) {
-  bar::f(x); // expected-error{{cannot initialize a parameter of type 'Foo::foo *' (aka 'bar::Foo::foo *') with an lvalue of type 'Foo::foo *')}}
+  bar::f(x); // expected-error{{cannot initialize a parameter of type 'Foo::foo *' (aka 'bar::Foo::foo *') with an lvalue of type 'Foo::foo *'}}
 }
 
 // PR9548 - "no known conversion from 'vector<string>' to 'vector<string>'"
diff --git a/test/Misc/diag-verify.cpp b/test/Misc/diag-verify.cpp
new file mode 100644
index 0000000000..895bc3fe03
--- /dev/null
+++ b/test/Misc/diag-verify.cpp
@@ -0,0 +1,48 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s 2>&1 | FileCheck %s
+
+// Test the -verify flag.  Each of the "x = y;" lines will produce a
+// "use of undeclared identifier 'y'" error message.
+
+void test() {
+  int x;
+  // Proper matches here.
+  x = y; // expected-error{{use of undeclared identifier 'y'}}
+  x = y; // expected-error{{use of undeclared identifier}}
+  x = y; // expected-error{{undeclared identifier 'y'}}
+  x = y; // expected-error{{use of}}
+  x = y; // expected-error{{undeclared identifier}}
+  x = y; // expected-error{{'y'}}
+
+  // Bad matches here.
+  x = y; // expected-error{{use of undeclared identifier 'y' is fine}}
+  x = y; // expected-error{{abuse of undeclared identifier 'y'}}
+  x = y; // expected-error{{good use of undeclared identifier 'y' in code}}
+  x = y; // expected-error{{ use of undeclared identifier 'y' }}
+  x = y; // expected-error{{use of undeclared identifier 'y' is disallowed}}
+  x = y; // expected-error{{please don't use of undeclared identifier 'y'}}
+  x = y; // expected-error{{use of undeclared identifier 'y'; please declare y before use}}
+  x = y; // expected-error{{use of use of undeclared identifier 'y'}}
+  x = y; // expected-error{{use of undeclared identifier 'y' identifier 'y'}}
+}
+
+//CHECK: error: 'error' diagnostics expected but not seen: 
+//CHECK:   Line 17: use of undeclared identifier 'y' is fine
+//CHECK:   Line 18: abuse of undeclared identifier 'y'
+//CHECK:   Line 19: good use of undeclared identifier 'y' in code
+//CHECK:   Line 20:  use of undeclared identifier 'y' 
+//CHECK:   Line 21: use of undeclared identifier 'y' is disallowed
+//CHECK:   Line 22: please don't use of undeclared identifier 'y'
+//CHECK:   Line 23: use of undeclared identifier 'y'; please declare y before use
+//CHECK:   Line 24: use of use of undeclared identifier 'y'
+//CHECK:   Line 25: use of undeclared identifier 'y' identifier 'y'
+//CHECK: error: 'error' diagnostics seen but not expected: 
+//CHECK:   Line 17: use of undeclared identifier 'y'
+//CHECK:   Line 18: use of undeclared identifier 'y'
+//CHECK:   Line 19: use of undeclared identifier 'y'
+//CHECK:   Line 20: use of undeclared identifier 'y'
+//CHECK:   Line 21: use of undeclared identifier 'y'
+//CHECK:   Line 22: use of undeclared identifier 'y'
+//CHECK:   Line 23: use of undeclared identifier 'y'
+//CHECK:   Line 24: use of undeclared identifier 'y'
+//CHECK:   Line 25: use of undeclared identifier 'y'
+//CHECK: 18 errors generated.