aboutsummaryrefslogtreecommitdiff
path: root/test/Frontend/verify.c
diff options
context:
space:
mode:
authorAndy Gibbs <andyg1001@hotmail.co.uk>2012-10-19 12:49:32 +0000
committerAndy Gibbs <andyg1001@hotmail.co.uk>2012-10-19 12:49:32 +0000
commit266dba3661928d26f043560b169bea87578aa917 (patch)
tree0c8f3042a1255fb78437c4e239921fd92fe30a96 /test/Frontend/verify.c
parent8e8fb3be5bd78f0564444eca02b404566a5f3b5d (diff)
Change VerifyDiagnosticConsumer so that it *must* contain at least one "expected-*" directive. As a result, for test-cases that are not expected to generate any diagnostics, an additional directive "expected-no-diagnostics" has been implemented which can then be included in such test-cases. This new directive may not be used in conjunction with any other "expected-*" directive.
This change was initially proposed as a solution to the problem highlighted by check-in r164677, i.e. that -verify will not cause a test-case failure where the compile command does not actually reference the file. Patch reviewed by David Blaikie. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@166281 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Frontend/verify.c')
-rw-r--r--test/Frontend/verify.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/Frontend/verify.c b/test/Frontend/verify.c
index 8b4edc5a76..062e6bd861 100644
--- a/test/Frontend/verify.c
+++ b/test/Frontend/verify.c
@@ -111,9 +111,10 @@ unexpected b; // expected-error@33 1-1 {{unknown type}}
#if 0
// RUN: %clang_cc1 -verify %t.invalid 2>&1 | FileCheck -check-prefix=CHECK6 %s
-// CHECK6: error: 'error' diagnostics seen but not expected:
+// CHECK6: error: no expected directives found: consider use of 'expected-no-diagnostics'
+// CHECK6-NEXT: error: 'error' diagnostics seen but not expected:
// CHECK6-NEXT: (frontend): error reading '{{.*}}verify.c.tmp.invalid'
-// CHECK6-NEXT: 1 error generated.
+// CHECK6-NEXT: 2 errors generated.
// RUN: echo -e '//expected-error@2{{1}}\n#error 2' | %clang_cc1 -verify 2>&1 | FileCheck -check-prefix=CHECK7 %s