Prior to adding the new "expected-no-diagnostics" directive to VerifyDiagnosticConsumer, make the necessary adjustment to 580 test-cases which will henceforth require this new directive.
llvm-svn: 166280
diff --git a/clang/test/PCH/__va_list_tag.c b/clang/test/PCH/__va_list_tag.c
index 23c54ea..efe5c1b 100644
--- a/clang/test/PCH/__va_list_tag.c
+++ b/clang/test/PCH/__va_list_tag.c
@@ -7,6 +7,8 @@
// RUN: %clang_cc1 -triple=x86_64-unknown-freebsd7.0 -emit-pch -x c-header -o %t %S/Inputs/__va_list_tag.h
// RUN: %clang_cc1 -triple=x86_64-unknown-freebsd7.0 -include-pch %t %s -verify
+// expected-no-diagnostics
+
int myvprintf(const char *fmt, va_list args) {
return myvfprintf(fmt, args);
}
diff --git a/clang/test/PCH/asm.c b/clang/test/PCH/asm.c
index 99bc14d..160829b 100644
--- a/clang/test/PCH/asm.c
+++ b/clang/test/PCH/asm.c
@@ -5,6 +5,7 @@
// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-pch -o %t %S/asm.h
// RUN: %clang_cc1 -triple i386-unknown-unknown -include-pch %t -fsyntax-only -verify %s
+// expected-no-diagnostics
void call_f(void) { f(); }
diff --git a/clang/test/PCH/builtins.c b/clang/test/PCH/builtins.c
index eed2224..da9eef7 100644
--- a/clang/test/PCH/builtins.c
+++ b/clang/test/PCH/builtins.c
@@ -5,6 +5,8 @@
// RUN: %clang_cc1 -emit-pch -o %t %S/builtins.h
// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s
+// expected-no-diagnostics
+
void hello() {
printf("Hello, World!");
}
diff --git a/clang/test/PCH/chain-categories.m b/clang/test/PCH/chain-categories.m
index 1b91c73..7836e09 100644
--- a/clang/test/PCH/chain-categories.m
+++ b/clang/test/PCH/chain-categories.m
@@ -4,6 +4,8 @@
// With PCH
// RUN: %clang_cc1 -fsyntax-only -verify %s -chain-include %s -chain-include %s
+// expected-no-diagnostics
+
#ifndef HEADER1
#define HEADER1
//===----------------------------------------------------------------------===//
diff --git a/clang/test/PCH/chain-class-extension.m b/clang/test/PCH/chain-class-extension.m
index c99d6d4..03fdee7 100644
--- a/clang/test/PCH/chain-class-extension.m
+++ b/clang/test/PCH/chain-class-extension.m
@@ -4,6 +4,8 @@
// With PCH
// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64-apple-darwin10 -fobjc-arc %s -chain-include %s -chain-include %s
+// expected-no-diagnostics
+
#ifndef HEADER1
#define HEADER1
//===----------------------------------------------------------------------===//
diff --git a/clang/test/PCH/chain-cxx.cpp b/clang/test/PCH/chain-cxx.cpp
index 0d50e61..4b64f51 100644
--- a/clang/test/PCH/chain-cxx.cpp
+++ b/clang/test/PCH/chain-cxx.cpp
@@ -6,6 +6,8 @@
// With PCH
// RUN: %clang_cc1 -fsyntax-only -verify %s -chain-include %s -chain-include %s
+// expected-no-diagnostics
+
#ifndef HEADER1
#define HEADER1
//===----------------------------------------------------------------------===//
diff --git a/clang/test/PCH/chain-decls.c b/clang/test/PCH/chain-decls.c
index f5724c4..bffa092 100644
--- a/clang/test/PCH/chain-decls.c
+++ b/clang/test/PCH/chain-decls.c
@@ -7,6 +7,8 @@
// RUN: %clang_cc1 -include-pch %t2 -fsyntax-only -verify %s
// RUN: %clang_cc1 -ast-print -include-pch %t2 %s | FileCheck %s
+// expected-no-diagnostics
+
// CHECK: void f();
// CHECK: void g();
diff --git a/clang/test/PCH/chain-macro.c b/clang/test/PCH/chain-macro.c
index 18356f7..b0fd63d 100644
--- a/clang/test/PCH/chain-macro.c
+++ b/clang/test/PCH/chain-macro.c
@@ -2,6 +2,7 @@
// RUN: %clang_cc1 -emit-pch -o %t2 -detailed-preprocessing-record %S/Inputs/chain-macro2.h -include-pch %t1
// RUN: %clang_cc1 -fsyntax-only -verify -include-pch %t2 %s
// RUN: %clang_cc1 -ast-print -include-pch %t2 %s | FileCheck %s
+// expected-no-diagnostics
// CHECK: void f();
FOOBAR
diff --git a/clang/test/PCH/chain-remap-types.m b/clang/test/PCH/chain-remap-types.m
index 585da44..13f2e39b 100644
--- a/clang/test/PCH/chain-remap-types.m
+++ b/clang/test/PCH/chain-remap-types.m
@@ -2,6 +2,7 @@
// RUN: %clang_cc1 -emit-pch -x objective-c-header -o %t2 %S/Inputs/chain-remap-types2.h -include-pch %t1
// RUN: %clang_cc1 -include-pch %t2 -fsyntax-only -verify %s
// RUN: %clang_cc1 -ast-print -include-pch %t2 %s | FileCheck %s
+// expected-no-diagnostics
// CHECK: @class X;
// CHECK: struct Y
diff --git a/clang/test/PCH/cmdline-include.c b/clang/test/PCH/cmdline-include.c
index ad45192..556c28e 100644
--- a/clang/test/PCH/cmdline-include.c
+++ b/clang/test/PCH/cmdline-include.c
@@ -2,5 +2,6 @@
// RUN: %clang_cc1 %s -include-pch %t -fsyntax-only -verify
// RUN: %clang_cc1 -x c-header %S/cmdline-include1.h -emit-pch -o %t
// RUN: %clang_cc1 %s -include-pch %t -include %S/cmdline-include2.h -fsyntax-only -verify
+// expected-no-diagnostics
int g = x1 + x2;
diff --git a/clang/test/PCH/cxx-exprs.cpp b/clang/test/PCH/cxx-exprs.cpp
index 9cd3194..b7707e0 100644
--- a/clang/test/PCH/cxx-exprs.cpp
+++ b/clang/test/PCH/cxx-exprs.cpp
@@ -5,6 +5,8 @@
// RUN: %clang_cc1 -std=c++11 -emit-pch -o %t %s
// RUN: %clang_cc1 -include-pch %t -verify -std=c++11 %s
+// expected-no-diagnostics
+
#ifndef HEADER
#define HEADER
diff --git a/clang/test/PCH/cxx-friends.cpp b/clang/test/PCH/cxx-friends.cpp
index bdba42b..f7d45ce 100644
--- a/clang/test/PCH/cxx-friends.cpp
+++ b/clang/test/PCH/cxx-friends.cpp
@@ -5,6 +5,8 @@
// RUN: %clang_cc1 -x c++-header -emit-pch -o %t %S/cxx-friends.h
// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s
+// expected-no-diagnostics
+
class F {
void m() {
A* a;
diff --git a/clang/test/PCH/cxx-functions.cpp b/clang/test/PCH/cxx-functions.cpp
index 74df01a..3b4fe77 100644
--- a/clang/test/PCH/cxx-functions.cpp
+++ b/clang/test/PCH/cxx-functions.cpp
@@ -4,6 +4,8 @@
// RUN: %clang_cc1 -x c++-header -emit-pch -o %t %S/cxx-functions.h
// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s
+// expected-no-diagnostics
+
void test_foo() {
foo();
diff --git a/clang/test/PCH/cxx-implicit-moves.cpp b/clang/test/PCH/cxx-implicit-moves.cpp
index ccdc874..ff6322d 100644
--- a/clang/test/PCH/cxx-implicit-moves.cpp
+++ b/clang/test/PCH/cxx-implicit-moves.cpp
@@ -1,6 +1,7 @@
// Test with PCH
// RUN: %clang_cc1 -std=c++11 -x c++-header -emit-pch -o %t %s
// RUN: %clang_cc1 -std=c++11 -include-pch %t -verify %s
+// expected-no-diagnostics
// PR10847
#ifndef HEADER
diff --git a/clang/test/PCH/cxx-method.cpp b/clang/test/PCH/cxx-method.cpp
index 6ec65b2..40490ea 100644
--- a/clang/test/PCH/cxx-method.cpp
+++ b/clang/test/PCH/cxx-method.cpp
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -x c++ -emit-pch %S/Inputs/cxx-method.h -o %t
// RUN: %clang_cc1 -include-pch %t -verify %s
+// expected-no-diagnostics
void S::m(int x) { }
diff --git a/clang/test/PCH/cxx-ms-function-specialization-class-scope.cpp b/clang/test/PCH/cxx-ms-function-specialization-class-scope.cpp
index 1803a11..afbb80b 100644
--- a/clang/test/PCH/cxx-ms-function-specialization-class-scope.cpp
+++ b/clang/test/PCH/cxx-ms-function-specialization-class-scope.cpp
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -fms-extensions -triple i386-unknown-unknown -x c++-header -emit-pch -o %t %S/cxx-ms-function-specialization-class-scope.h
// RUN: %clang_cc1 -fms-extensions -triple i386-unknown-unknown -include-pch %t -fsyntax-only -verify %s
+// expected-no-diagnostics
void test2()
diff --git a/clang/test/PCH/cxx-namespaces.cpp b/clang/test/PCH/cxx-namespaces.cpp
index 0fd3de7..e0ff27c 100644
--- a/clang/test/PCH/cxx-namespaces.cpp
+++ b/clang/test/PCH/cxx-namespaces.cpp
@@ -5,6 +5,8 @@
// RUN: %clang_cc1 -x c++-header -emit-pch -o %t %S/cxx-namespaces.h
// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s
+// expected-no-diagnostics
+
void m() {
N::x = 0;
}
diff --git a/clang/test/PCH/cxx-templates.cpp b/clang/test/PCH/cxx-templates.cpp
index 6312ca9..d27e9ca 100644
--- a/clang/test/PCH/cxx-templates.cpp
+++ b/clang/test/PCH/cxx-templates.cpp
@@ -7,6 +7,8 @@
// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fexceptions -include-pch %t -verify %s -ast-dump -o -
// RUN: %clang_cc1 -std=c++11 -fcxx-exceptions -fexceptions -include-pch %t %s -emit-llvm -o - | FileCheck %s
+// expected-no-diagnostics
+
// CHECK: define weak_odr void @_ZN2S4IiE1mEv
// CHECK: define linkonce_odr void @_ZN2S3IiE1mEv
diff --git a/clang/test/PCH/cxx-traits.cpp b/clang/test/PCH/cxx-traits.cpp
index 3df3479..938f36f 100644
--- a/clang/test/PCH/cxx-traits.cpp
+++ b/clang/test/PCH/cxx-traits.cpp
@@ -4,6 +4,8 @@
// RUN: %clang_cc1 -x c++-header -std=c++11 -emit-pch -o %t %S/cxx-traits.h
// RUN: %clang_cc1 -std=c++11 -include-pch %t -fsyntax-only -verify %s
+// expected-no-diagnostics
+
bool _Is_pod_comparator = __is_pod<int>::__value;
bool _Is_empty_check = __is_empty<int>::__value;
diff --git a/clang/test/PCH/cxx-typeid.cpp b/clang/test/PCH/cxx-typeid.cpp
index 41dd544..d1e0f9d 100644
--- a/clang/test/PCH/cxx-typeid.cpp
+++ b/clang/test/PCH/cxx-typeid.cpp
@@ -4,6 +4,8 @@
// RUN: %clang -ccc-pch-is-pch -x c++-header -o %t.gch %S/cxx-typeid.h
// RUN: %clang -ccc-pch-is-pch -include %t -fsyntax-only -Xclang -verify %s
+// expected-no-diagnostics
+
void f() {
(void)typeid(int);
}
diff --git a/clang/test/PCH/cxx-variadic-templates.cpp b/clang/test/PCH/cxx-variadic-templates.cpp
index c78a1a5..dc00758 100644
--- a/clang/test/PCH/cxx-variadic-templates.cpp
+++ b/clang/test/PCH/cxx-variadic-templates.cpp
@@ -7,6 +7,8 @@
// RUN: %clang_cc1 -std=c++11 -include-pch %t -verify %s -ast-dump -o -
// RUN: %clang_cc1 -std=c++11 -include-pch %t %s -emit-llvm -o - | FileCheck %s
+// expected-no-diagnostics
+
// CHECK: allocate_shared
shared_ptr<int> spi = shared_ptr<int>::allocate_shared(1, 2);
diff --git a/clang/test/PCH/cxx11-exception-spec.cpp b/clang/test/PCH/cxx11-exception-spec.cpp
index 3fca4e4..446619e 100644
--- a/clang/test/PCH/cxx11-exception-spec.cpp
+++ b/clang/test/PCH/cxx11-exception-spec.cpp
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -pedantic-errors -std=c++11 -emit-pch %s -o %t
// RUN: %clang_cc1 -pedantic-errors -std=c++11 -include-pch %t -verify %s
+// expected-no-diagnostics
#ifndef HEADER_INCLUDED
diff --git a/clang/test/PCH/cxx_exprs.cpp b/clang/test/PCH/cxx_exprs.cpp
index 01fc33a..0fb7590 100644
--- a/clang/test/PCH/cxx_exprs.cpp
+++ b/clang/test/PCH/cxx_exprs.cpp
@@ -5,6 +5,8 @@
// RUN: %clang_cc1 -fcxx-exceptions -fexceptions -x c++-header -std=c++11 -emit-pch -o %t %S/cxx_exprs.h
// RUN: %clang_cc1 -fcxx-exceptions -fexceptions -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-dump
+// expected-no-diagnostics
+
int integer;
double floating;
char character;
diff --git a/clang/test/PCH/enum.c b/clang/test/PCH/enum.c
index 10ceb7c..81dbd90 100644
--- a/clang/test/PCH/enum.c
+++ b/clang/test/PCH/enum.c
@@ -5,6 +5,8 @@
// RUN: %clang_cc1 -emit-pch -o %t %S/enum.h
// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s
+// expected-no-diagnostics
+
int i = Red;
int return_enum_constant() {
diff --git a/clang/test/PCH/exprs.c b/clang/test/PCH/exprs.c
index 5928abd..c0b279f 100644
--- a/clang/test/PCH/exprs.c
+++ b/clang/test/PCH/exprs.c
@@ -3,7 +3,11 @@
// Test with pch.
// RUN: %clang_cc1 -emit-pch -fblocks -o %t %S/exprs.h
-// RUN: %clang_cc1 -fblocks -include-pch %t -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fblocks -include-pch %t -fsyntax-only -verify %s -DWITH_PCH
+
+#ifdef WITH_PCH
+// expected-no-diagnostics
+#endif
__SIZE_TYPE__ size_type_value;
int integer;
diff --git a/clang/test/PCH/objc_container.m b/clang/test/PCH/objc_container.m
index 1e59054..ad7a6c3 100644
--- a/clang/test/PCH/objc_container.m
+++ b/clang/test/PCH/objc_container.m
@@ -7,6 +7,8 @@
// RUN: %clang -cc1 -include-pch %t -ast-print %s | FileCheck -check-prefix=PRINT %s
// RUN: %clang -cc1 -include-pch %t -emit-llvm -o - %s | FileCheck -check-prefix=IR %s
+// expected-no-diagnostics
+
// CHECK-PRINT: id oldObject = array[10];
// CHECK-PRINT: array[10] = oldObject;
// CHECK-PRINT: oldObject = dictionary[key];
diff --git a/clang/test/PCH/objc_import.m b/clang/test/PCH/objc_import.m
index 277c6dd..c7dd805 100644
--- a/clang/test/PCH/objc_import.m
+++ b/clang/test/PCH/objc_import.m
@@ -5,6 +5,8 @@
// RUN: %clang_cc1 -x objective-c -emit-pch -o %t %S/objc_import.h
// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s
+// expected-no-diagnostics
+
#import "objc_import.h"
void func() {
diff --git a/clang/test/PCH/objc_literals.m b/clang/test/PCH/objc_literals.m
index cce3173..c1220f8 100644
--- a/clang/test/PCH/objc_literals.m
+++ b/clang/test/PCH/objc_literals.m
@@ -3,6 +3,8 @@
// RUN: %clang -cc1 -include-pch %t -ast-print %s | FileCheck -check-prefix=PRINT %s
// RUN: %clang -cc1 -include-pch %t -emit-llvm -o - %s | FileCheck -check-prefix=IR %s
+// expected-no-diagnostics
+
#ifndef HEADER
#define HEADER
diff --git a/clang/test/PCH/objc_literals.mm b/clang/test/PCH/objc_literals.mm
index 8ef3351..e41dadd 100644
--- a/clang/test/PCH/objc_literals.mm
+++ b/clang/test/PCH/objc_literals.mm
@@ -3,6 +3,8 @@
// RUN: %clang -cc1 -include-pch %t -x objective-c++ -std=c++0x -ast-print %s | FileCheck -check-prefix=PRINT %s
// RUN: %clang -cc1 -include-pch %t -x objective-c++ -std=c++0x -emit-llvm -o - %s | FileCheck -check-prefix=IR %s
+// expected-no-diagnostics
+
#ifndef HEADER
#define HEADER
diff --git a/clang/test/PCH/objc_methods.m b/clang/test/PCH/objc_methods.m
index e8aab84..ea40460 100644
--- a/clang/test/PCH/objc_methods.m
+++ b/clang/test/PCH/objc_methods.m
@@ -5,6 +5,8 @@
// RUN: %clang_cc1 -x objective-c -emit-pch -o %t %S/objc_methods.h
// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s
+// expected-no-diagnostics
+
void func() {
TestPCH *xx;
TestForwardClassDecl *yy;
diff --git a/clang/test/PCH/objc_property.m b/clang/test/PCH/objc_property.m
index b51cd90..88a0919 100644
--- a/clang/test/PCH/objc_property.m
+++ b/clang/test/PCH/objc_property.m
@@ -5,6 +5,8 @@
// RUN: %clang_cc1 -x objective-c -emit-pch -o %t %S/objc_property.h
// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s
+// expected-no-diagnostics
+
void func() {
TestProperties *xx = [TestProperties alloc];
xx.value = 5;
diff --git a/clang/test/PCH/pending-ids.m b/clang/test/PCH/pending-ids.m
index b612d89..2ca0e6e 100644
--- a/clang/test/PCH/pending-ids.m
+++ b/clang/test/PCH/pending-ids.m
@@ -7,6 +7,8 @@
// RUN: %clang_cc1 %s -emit-pch -o %t
// RUN: %clang_cc1 -emit-llvm-only -verify %s -include-pch %t -g
+// expected-no-diagnostics
+
#ifndef HEADER
#define HEADER
//===----------------------------------------------------------------------===//
diff --git a/clang/test/PCH/pragma-diag-section.cpp b/clang/test/PCH/pragma-diag-section.cpp
index 5b996bb..103b252 100644
--- a/clang/test/PCH/pragma-diag-section.cpp
+++ b/clang/test/PCH/pragma-diag-section.cpp
@@ -5,6 +5,8 @@
// RUN: %clang_cc1 %s -emit-pch -o %t
// RUN: %clang_cc1 %s -include-pch %t -verify -fsyntax-only
+// expected-no-diagnostics
+
#ifndef HEADER
#define HEADER
diff --git a/clang/test/PCH/pragma-diag.c b/clang/test/PCH/pragma-diag.c
index b304c4b..601c940 100644
--- a/clang/test/PCH/pragma-diag.c
+++ b/clang/test/PCH/pragma-diag.c
@@ -5,6 +5,8 @@
// RUN: %clang_cc1 %s -emit-pch -o %t
// RUN: %clang_cc1 %s -include-pch %t -verify -fsyntax-only
+// expected-no-diagnostics
+
#ifndef HEADER
#define HEADER
diff --git a/clang/test/PCH/rdar8852495.c b/clang/test/PCH/rdar8852495.c
index fb465a3..7639f1f 100644
--- a/clang/test/PCH/rdar8852495.c
+++ b/clang/test/PCH/rdar8852495.c
@@ -5,6 +5,8 @@
// RUN: %clang_cc1 %s -emit-pch -o %t -Wsign-compare -Wtautological-compare
// RUN: %clang_cc1 %s -include-pch %t -verify -fsyntax-only -Wno-sign-compare -Wtautological-compare
+// expected-no-diagnostics
+
// This tests that diagnostic mappings from PCH are propagated for #pragma
// diagnostics but not for command-line flags.
diff --git a/clang/test/PCH/reinclude.cpp b/clang/test/PCH/reinclude.cpp
index 97e22cf..4bec050 100644
--- a/clang/test/PCH/reinclude.cpp
+++ b/clang/test/PCH/reinclude.cpp
@@ -7,4 +7,6 @@
// RUN: %clang_cc1 -x c++-header %S/reinclude2.h -include-pch %t1 -emit-pch -o %t2
// RUN: %clang_cc1 %s -include-pch %t2 -fsyntax-only -verify
+// expected-no-diagnostics
+
int q2 = A::y;
diff --git a/clang/test/PCH/single-token-macro.c b/clang/test/PCH/single-token-macro.c
index 29edb75..52873bf 100644
--- a/clang/test/PCH/single-token-macro.c
+++ b/clang/test/PCH/single-token-macro.c
@@ -7,6 +7,8 @@
// RUN: %clang_cc1 %s -emit-pch -o %t
// RUN: %clang_cc1 %s -include-pch %t -verify -fsyntax-only
+// expected-no-diagnostics
+
#ifndef HEADER
#define HEADER