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/SemaObjC/ClassPropertyNotObject.m b/clang/test/SemaObjC/ClassPropertyNotObject.m
index 02ed40a..67d76b8 100644
--- a/clang/test/SemaObjC/ClassPropertyNotObject.m
+++ b/clang/test/SemaObjC/ClassPropertyNotObject.m
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
// RUN: %clang_cc1 -x objective-c++ -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://10565506
@protocol P @end
diff --git a/clang/test/SemaObjC/ContClassPropertyLookup.m b/clang/test/SemaObjC/ContClassPropertyLookup.m
index 06a0ffa..bf4f643 100644
--- a/clang/test/SemaObjC/ContClassPropertyLookup.m
+++ b/clang/test/SemaObjC/ContClassPropertyLookup.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
@interface MyObject {
int _foo;
diff --git a/clang/test/SemaObjC/arc-readonly-property-ivar-1.m b/clang/test/SemaObjC/arc-readonly-property-ivar-1.m
index c773f26..418f90d 100644
--- a/clang/test/SemaObjC/arc-readonly-property-ivar-1.m
+++ b/clang/test/SemaObjC/arc-readonly-property-ivar-1.m
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -fobjc-default-synthesize-properties -triple x86_64-apple-darwin11 -fobjc-runtime-has-weak -fobjc-arc -fsyntax-only -verify -Wno-objc-root-class %s
// RUN: %clang_cc1 -x objective-c++ -fobjc-default-synthesize-properties -triple x86_64-apple-darwin11 -fobjc-runtime-has-weak -fobjc-arc -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar:// 10558871
@interface PP
diff --git a/clang/test/SemaObjC/arc-readonly-property-ivar.m b/clang/test/SemaObjC/arc-readonly-property-ivar.m
index 635b9fe..bcc1f4b 100644
--- a/clang/test/SemaObjC/arc-readonly-property-ivar.m
+++ b/clang/test/SemaObjC/arc-readonly-property-ivar.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -triple x86_64-apple-darwin11 -fobjc-runtime-has-weak -fobjc-arc -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar:// 10558871
@interface PP
diff --git a/clang/test/SemaObjC/arc-setter-property-match.m b/clang/test/SemaObjC/arc-setter-property-match.m
index 9158b09..83a07e9 100644
--- a/clang/test/SemaObjC/arc-setter-property-match.m
+++ b/clang/test/SemaObjC/arc-setter-property-match.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -triple x86_64-apple-darwin11 -fsyntax-only -fobjc-arc -fblocks -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://10156674
@class NSArray;
diff --git a/clang/test/SemaObjC/arc-unsafe_unretained.m b/clang/test/SemaObjC/arc-unsafe_unretained.m
index a6c5f98..99e870f 100644
--- a/clang/test/SemaObjC/arc-unsafe_unretained.m
+++ b/clang/test/SemaObjC/arc-unsafe_unretained.m
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -verify -fblocks %s
// RUN: %clang_cc1 -fsyntax-only -verify -fblocks -fobjc-arc %s
+// expected-no-diagnostics
struct X {
__unsafe_unretained id object;
diff --git a/clang/test/SemaObjC/attr-cleanup.m b/clang/test/SemaObjC/attr-cleanup.m
index 8415c69..978498c 100644
--- a/clang/test/SemaObjC/attr-cleanup.m
+++ b/clang/test/SemaObjC/attr-cleanup.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 %s -verify -fsyntax-only
+// expected-no-diagnostics
@class NSString;
diff --git a/clang/test/SemaObjC/block-as-object.m b/clang/test/SemaObjC/block-as-object.m
index a85b606..945d6f6 100644
--- a/clang/test/SemaObjC/block-as-object.m
+++ b/clang/test/SemaObjC/block-as-object.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 %s -fsyntax-only -verify -fblocks
+// expected-no-diagnostics
@interface Whatever
- copy;
diff --git a/clang/test/SemaObjC/block-ivar.m b/clang/test/SemaObjC/block-ivar.m
index c7ea1d9..5864b63 100644
--- a/clang/test/SemaObjC/block-ivar.m
+++ b/clang/test/SemaObjC/block-ivar.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s -fblocks
+// expected-no-diagnostics
@interface NSObject {
struct objc_object *isa;
diff --git a/clang/test/SemaObjC/block-return.m b/clang/test/SemaObjC/block-return.m
index 15c3fb6..e0bac99 100644
--- a/clang/test/SemaObjC/block-return.m
+++ b/clang/test/SemaObjC/block-return.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -verify -fblocks -fobjc-gc-only %s
+// expected-no-diagnostics
// rdar://8979379
@interface NSString
diff --git a/clang/test/SemaObjC/builtin_objc_assign_ivar.m b/clang/test/SemaObjC/builtin_objc_assign_ivar.m
index 5839bf4..6c28178 100644
--- a/clang/test/SemaObjC/builtin_objc_assign_ivar.m
+++ b/clang/test/SemaObjC/builtin_objc_assign_ivar.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -x objective-c %s -fsyntax-only -verify
+// expected-no-diagnostics
// rdar://9362887
typedef __typeof__(((int*)0)-((int*)0)) ptrdiff_t;
diff --git a/clang/test/SemaObjC/builtin_objc_msgSend.m b/clang/test/SemaObjC/builtin_objc_msgSend.m
index bf17225..bfa09d9 100644
--- a/clang/test/SemaObjC/builtin_objc_msgSend.m
+++ b/clang/test/SemaObjC/builtin_objc_msgSend.m
@@ -1,3 +1,4 @@
// RUN: %clang_cc1 %s -fsyntax-only -verify
+// expected-no-diagnostics
// rdar://8632525
extern id objc_msgSend(id self, SEL op, ...);
diff --git a/clang/test/SemaObjC/category-method-lookup-2.m b/clang/test/SemaObjC/category-method-lookup-2.m
index a31d824..ed347c7 100644
--- a/clang/test/SemaObjC/category-method-lookup-2.m
+++ b/clang/test/SemaObjC/category-method-lookup-2.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
typedef struct objc_class *Class;
@interface NSObject
diff --git a/clang/test/SemaObjC/category-method-lookup.m b/clang/test/SemaObjC/category-method-lookup.m
index 4223a74..6239e94 100644
--- a/clang/test/SemaObjC/category-method-lookup.m
+++ b/clang/test/SemaObjC/category-method-lookup.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
@interface Foo
@end
diff --git a/clang/test/SemaObjC/class-getter-using-dotsyntax.m b/clang/test/SemaObjC/class-getter-using-dotsyntax.m
index 4ff9428..dd384b5 100644
--- a/clang/test/SemaObjC/class-getter-using-dotsyntax.m
+++ b/clang/test/SemaObjC/class-getter-using-dotsyntax.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
typedef struct objc_class *Class;
diff --git a/clang/test/SemaObjC/class-property-access.m b/clang/test/SemaObjC/class-property-access.m
index c46d3fb..735b51a 100644
--- a/clang/test/SemaObjC/class-property-access.m
+++ b/clang/test/SemaObjC/class-property-access.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@interface Test {}
+ (Test*)one;
diff --git a/clang/test/SemaObjC/class-protocol.m b/clang/test/SemaObjC/class-protocol.m
index 91cd138..021047e 100644
--- a/clang/test/SemaObjC/class-protocol.m
+++ b/clang/test/SemaObjC/class-protocol.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
// pr5552
@interface Protocol
diff --git a/clang/test/SemaObjC/comptypes-2.m b/clang/test/SemaObjC/comptypes-2.m
index 74e42c9..8e90455 100644
--- a/clang/test/SemaObjC/comptypes-2.m
+++ b/clang/test/SemaObjC/comptypes-2.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
#define nil (void *)0;
#define Nil (void *)0;
diff --git a/clang/test/SemaObjC/comptypes-8.m b/clang/test/SemaObjC/comptypes-8.m
index 750b0a6..e651030 100644
--- a/clang/test/SemaObjC/comptypes-8.m
+++ b/clang/test/SemaObjC/comptypes-8.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@protocol MyProtocol
@end
diff --git a/clang/test/SemaObjC/conditional-expr-5.m b/clang/test/SemaObjC/conditional-expr-5.m
index 47aed3e..b1f7e59 100644
--- a/clang/test/SemaObjC/conditional-expr-5.m
+++ b/clang/test/SemaObjC/conditional-expr-5.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
@interface PBXBuildSettingsDictionary
{
diff --git a/clang/test/SemaObjC/conditional-expr-6.m b/clang/test/SemaObjC/conditional-expr-6.m
index 098688a..e944e54 100644
--- a/clang/test/SemaObjC/conditional-expr-6.m
+++ b/clang/test/SemaObjC/conditional-expr-6.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@protocol MyProtocol @end
diff --git a/clang/test/SemaObjC/conditional-expr-7.m b/clang/test/SemaObjC/conditional-expr-7.m
index 3ddf3d7..5b4a863 100644
--- a/clang/test/SemaObjC/conditional-expr-7.m
+++ b/clang/test/SemaObjC/conditional-expr-7.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
// radar 7682116
@interface Super @end
diff --git a/clang/test/SemaObjC/conditional-expr-8.m b/clang/test/SemaObjC/conditional-expr-8.m
index 6799983..beddd20 100644
--- a/clang/test/SemaObjC/conditional-expr-8.m
+++ b/clang/test/SemaObjC/conditional-expr-8.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
// rdar://9296866
@interface NSResponder
diff --git a/clang/test/SemaObjC/conflict-nonfragile-abi2.m b/clang/test/SemaObjC/conflict-nonfragile-abi2.m
index 8197327..d0d6be8 100644
--- a/clang/test/SemaObjC/conflict-nonfragile-abi2.m
+++ b/clang/test/SemaObjC/conflict-nonfragile-abi2.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -verify -fsyntax-only -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://8225011
int glob;
diff --git a/clang/test/SemaObjC/delay-parsing-cfunctions.m b/clang/test/SemaObjC/delay-parsing-cfunctions.m
index a6f66fe..c74b054 100644
--- a/clang/test/SemaObjC/delay-parsing-cfunctions.m
+++ b/clang/test/SemaObjC/delay-parsing-cfunctions.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -Werror -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://10387088
@interface MyClass
diff --git a/clang/test/SemaObjC/direct-synthesized-ivar-access.m b/clang/test/SemaObjC/direct-synthesized-ivar-access.m
index dc14911..a276a64 100644
--- a/clang/test/SemaObjC/direct-synthesized-ivar-access.m
+++ b/clang/test/SemaObjC/direct-synthesized-ivar-access.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -fobjc-default-synthesize-properties -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://8673791
// rdar://9943851
diff --git a/clang/test/SemaObjC/enhanced-proto-2.m b/clang/test/SemaObjC/enhanced-proto-2.m
index 28b03d9..352f291 100644
--- a/clang/test/SemaObjC/enhanced-proto-2.m
+++ b/clang/test/SemaObjC/enhanced-proto-2.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
@protocol MyProto1
@optional
diff --git a/clang/test/SemaObjC/enum-fixed-type.m b/clang/test/SemaObjC/enum-fixed-type.m
index 95153be..4fe643f 100644
--- a/clang/test/SemaObjC/enum-fixed-type.m
+++ b/clang/test/SemaObjC/enum-fixed-type.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
#if !__has_feature(objc_fixed_enum)
# error Enumerations with a fixed underlying type are not supported
diff --git a/clang/test/SemaObjC/getter-setter-defined-in-category-of-parent.m b/clang/test/SemaObjC/getter-setter-defined-in-category-of-parent.m
index 71c3237..ff5c174 100644
--- a/clang/test/SemaObjC/getter-setter-defined-in-category-of-parent.m
+++ b/clang/test/SemaObjC/getter-setter-defined-in-category-of-parent.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
@interface MyParent {
int X;
diff --git a/clang/test/SemaObjC/id_builtin.m b/clang/test/SemaObjC/id_builtin.m
index a1431d6..be42e7d 100644
--- a/clang/test/SemaObjC/id_builtin.m
+++ b/clang/test/SemaObjC/id_builtin.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 %s -fsyntax-only -verify
+// expected-no-diagnostics
// id is now builtin. There should be no errors.
id obj;
diff --git a/clang/test/SemaObjC/ignore-qualifier-on-qualified-id.m b/clang/test/SemaObjC/ignore-qualifier-on-qualified-id.m
index 36a2c1a..996664f 100644
--- a/clang/test/SemaObjC/ignore-qualifier-on-qualified-id.m
+++ b/clang/test/SemaObjC/ignore-qualifier-on-qualified-id.m
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
// RUN: %clang_cc1 -x objective-c++ -fsyntax-only -verify %s
+// expected-no-diagnostics
// rdar://10667659
@protocol NSCopying @end
diff --git a/clang/test/SemaObjC/ignore-weakimport-method.m b/clang/test/SemaObjC/ignore-weakimport-method.m
index d71cebf..c68c578 100644
--- a/clang/test/SemaObjC/ignore-weakimport-method.m
+++ b/clang/test/SemaObjC/ignore-weakimport-method.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@interface foo
+ (void) cx __attribute__((weak_import));
- (void) x __attribute__((weak_import));
diff --git a/clang/test/SemaObjC/interface-layout-2.m b/clang/test/SemaObjC/interface-layout-2.m
index 02b1403..17e34d4 100644
--- a/clang/test/SemaObjC/interface-layout-2.m
+++ b/clang/test/SemaObjC/interface-layout-2.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 %s -fsyntax-only -verify
+// expected-no-diagnostics
@interface A
{
int ivar;
diff --git a/clang/test/SemaObjC/interface-layout.m b/clang/test/SemaObjC/interface-layout.m
index 336605a..9b083b0 100644
--- a/clang/test/SemaObjC/interface-layout.m
+++ b/clang/test/SemaObjC/interface-layout.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 %s -fsyntax-only -verify -triple i386-apple-darwin9 -fobjc-runtime=macosx-fragile-10.5
+// expected-no-diagnostics
typedef struct objc_object {} *id;
typedef signed char BOOL;
typedef unsigned int NSUInteger;
diff --git a/clang/test/SemaObjC/interface-scope-2.m b/clang/test/SemaObjC/interface-scope-2.m
index 60fd900..ffd740f 100644
--- a/clang/test/SemaObjC/interface-scope-2.m
+++ b/clang/test/SemaObjC/interface-scope-2.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -triple i686-apple-darwin9 -Wno-objc-root-class %s
+// expected-no-diagnostics
// FIXME: must also compile as Objective-C++
// <rdar://problem/6487662>
diff --git a/clang/test/SemaObjC/interface-scope.m b/clang/test/SemaObjC/interface-scope.m
index 0671dae..9875eca 100644
--- a/clang/test/SemaObjC/interface-scope.m
+++ b/clang/test/SemaObjC/interface-scope.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@interface I1 {
@private
diff --git a/clang/test/SemaObjC/ivar-access-package.m b/clang/test/SemaObjC/ivar-access-package.m
index abc3420..ff5ff4e 100644
--- a/clang/test/SemaObjC/ivar-access-package.m
+++ b/clang/test/SemaObjC/ivar-access-package.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
typedef unsigned char BOOL;
diff --git a/clang/test/SemaObjC/method-conflict-1.m b/clang/test/SemaObjC/method-conflict-1.m
index ca91ebd..654cd01 100644
--- a/clang/test/SemaObjC/method-conflict-1.m
+++ b/clang/test/SemaObjC/method-conflict-1.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// This test case tests the default behavior.
diff --git a/clang/test/SemaObjC/method-in-class-extension-impl.m b/clang/test/SemaObjC/method-in-class-extension-impl.m
index c205322..d74ae8f 100644
--- a/clang/test/SemaObjC/method-in-class-extension-impl.m
+++ b/clang/test/SemaObjC/method-in-class-extension-impl.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
// rdar://8530080
@protocol ViewDelegate @end
diff --git a/clang/test/SemaObjC/method-lookup-2.m b/clang/test/SemaObjC/method-lookup-2.m
index 53cae83..2596304 100644
--- a/clang/test/SemaObjC/method-lookup-2.m
+++ b/clang/test/SemaObjC/method-lookup-2.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
typedef signed char BOOL;
@protocol NSObject
diff --git a/clang/test/SemaObjC/method-lookup-4.m b/clang/test/SemaObjC/method-lookup-4.m
index 700565e..807d4da 100644
--- a/clang/test/SemaObjC/method-lookup-4.m
+++ b/clang/test/SemaObjC/method-lookup-4.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@interface NSObject {}
diff --git a/clang/test/SemaObjC/nested-typedef-decl.m b/clang/test/SemaObjC/nested-typedef-decl.m
index bb01ead..7051ac6 100644
--- a/clang/test/SemaObjC/nested-typedef-decl.m
+++ b/clang/test/SemaObjC/nested-typedef-decl.m
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -x objective-c -fsyntax-only -verify -Wno-objc-root-class %s
// RUN: %clang_cc1 -x objective-c++ -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://10041908
@interface Bar {
diff --git a/clang/test/SemaObjC/no-gc-weak-test.m b/clang/test/SemaObjC/no-gc-weak-test.m
index dd9b73c..6539a9b 100644
--- a/clang/test/SemaObjC/no-gc-weak-test.m
+++ b/clang/test/SemaObjC/no-gc-weak-test.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -triple i386-apple-darwin9 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
@interface Subtask
{
diff --git a/clang/test/SemaObjC/no-ivar-access-control.m b/clang/test/SemaObjC/no-ivar-access-control.m
index 6f00b1a..9bbff24 100644
--- a/clang/test/SemaObjC/no-ivar-access-control.m
+++ b/clang/test/SemaObjC/no-ivar-access-control.m
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -fdebugger-support -verify -Wno-objc-root-class %s
// RUN: %clang_cc1 -x objective-c++ -fdebugger-support -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://10997647
@interface I
diff --git a/clang/test/SemaObjC/no-warn-qual-mismatch.m b/clang/test/SemaObjC/no-warn-qual-mismatch.m
index 1e3c186..9638da4 100644
--- a/clang/test/SemaObjC/no-warn-qual-mismatch.m
+++ b/clang/test/SemaObjC/no-warn-qual-mismatch.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// radar 7211563
@interface X
diff --git a/clang/test/SemaObjC/no-warn-synth-protocol-meth.m b/clang/test/SemaObjC/no-warn-synth-protocol-meth.m
index 103f6bb..cdb855e 100644
--- a/clang/test/SemaObjC/no-warn-synth-protocol-meth.m
+++ b/clang/test/SemaObjC/no-warn-synth-protocol-meth.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
@protocol CYCdef
- (int)name;
diff --git a/clang/test/SemaObjC/no-warn-unimpl-method.m b/clang/test/SemaObjC/no-warn-unimpl-method.m
index dd6e3ad..174f70a 100644
--- a/clang/test/SemaObjC/no-warn-unimpl-method.m
+++ b/clang/test/SemaObjC/no-warn-unimpl-method.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -verify %s
+// expected-no-diagnostics
// This program tests that if class implements the forwardInvocation method, then
// every method possible is implemented in the class and should not issue
// warning of the "Method definition not found" kind. */
diff --git a/clang/test/SemaObjC/no-warning-unavail-unimp.m b/clang/test/SemaObjC/no-warning-unavail-unimp.m
index 88d519d..d5a4eac 100644
--- a/clang/test/SemaObjC/no-warning-unavail-unimp.m
+++ b/clang/test/SemaObjC/no-warning-unavail-unimp.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://9651605
@interface Foo
diff --git a/clang/test/SemaObjC/nowarn-superclass-method-mismatch.m b/clang/test/SemaObjC/nowarn-superclass-method-mismatch.m
index b211cde..d522e89 100644
--- a/clang/test/SemaObjC/nowarn-superclass-method-mismatch.m
+++ b/clang/test/SemaObjC/nowarn-superclass-method-mismatch.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -fobjc-arc -fobjc-runtime-has-weak -Wsuper-class-method-mismatch -verify %s
+// expected-no-diagnostics
// rdar://11793793
@class NSString;
diff --git a/clang/test/SemaObjC/nsobject-attribute-1.m b/clang/test/SemaObjC/nsobject-attribute-1.m
index 72d8fa6..4a75f5c 100644
--- a/clang/test/SemaObjC/nsobject-attribute-1.m
+++ b/clang/test/SemaObjC/nsobject-attribute-1.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fblocks -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
@interface NSObject
- (id)self;
diff --git a/clang/test/SemaObjC/objc-buffered-methods.m b/clang/test/SemaObjC/objc-buffered-methods.m
index a4b83be..55e4897 100644
--- a/clang/test/SemaObjC/objc-buffered-methods.m
+++ b/clang/test/SemaObjC/objc-buffered-methods.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://8843851
int* global;
diff --git a/clang/test/SemaObjC/objc-qualified-property-lookup.m b/clang/test/SemaObjC/objc-qualified-property-lookup.m
index 48b28cb..b5cadbd 100644
--- a/clang/test/SemaObjC/objc-qualified-property-lookup.m
+++ b/clang/test/SemaObjC/objc-qualified-property-lookup.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://9078584
@interface NSObject @end
diff --git a/clang/test/SemaObjC/overriding-property-in-class-extension.m b/clang/test/SemaObjC/overriding-property-in-class-extension.m
index 5cbc6d2..77efd55 100644
--- a/clang/test/SemaObjC/overriding-property-in-class-extension.m
+++ b/clang/test/SemaObjC/overriding-property-in-class-extension.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Weverything %s
+// expected-no-diagnostics
// rdar://12103434
@class NSString;
diff --git a/clang/test/SemaObjC/pedantic-dynamic-test.m b/clang/test/SemaObjC/pedantic-dynamic-test.m
index 61f36b3..1fc5ef6 100644
--- a/clang/test/SemaObjC/pedantic-dynamic-test.m
+++ b/clang/test/SemaObjC/pedantic-dynamic-test.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -pedantic -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar: // 7860960
@interface I
diff --git a/clang/test/SemaObjC/pragma-pack.m b/clang/test/SemaObjC/pragma-pack.m
index ba39257..6869bca 100644
--- a/clang/test/SemaObjC/pragma-pack.m
+++ b/clang/test/SemaObjC/pragma-pack.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -triple i686-apple-darwin9 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// Make sure pragma pack works inside ObjC methods. <rdar://problem/10893316>
@interface X
diff --git a/clang/test/SemaObjC/property-11.m b/clang/test/SemaObjC/property-11.m
index 2976115..e41a840 100644
--- a/clang/test/SemaObjC/property-11.m
+++ b/clang/test/SemaObjC/property-11.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@interface NSSound
@end
diff --git a/clang/test/SemaObjC/property-13.m b/clang/test/SemaObjC/property-13.m
index 2ca3416..362d6d3 100644
--- a/clang/test/SemaObjC/property-13.m
+++ b/clang/test/SemaObjC/property-13.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s -Wno-unreachable-code
+// expected-no-diagnostics
@interface NSObject
+ alloc;
diff --git a/clang/test/SemaObjC/property-2.m b/clang/test/SemaObjC/property-2.m
index f95af59..3298ee5 100644
--- a/clang/test/SemaObjC/property-2.m
+++ b/clang/test/SemaObjC/property-2.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
@interface Tester
@property char PropertyAtomic_char;
diff --git a/clang/test/SemaObjC/property-6.m b/clang/test/SemaObjC/property-6.m
index 933a4f0..f2a293e 100644
--- a/clang/test/SemaObjC/property-6.m
+++ b/clang/test/SemaObjC/property-6.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -fobjc-exceptions %s
+// expected-no-diagnostics
# 1 "<command line>"
# 1 "/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h" 1 3
typedef signed char BOOL;
diff --git a/clang/test/SemaObjC/property-7.m b/clang/test/SemaObjC/property-7.m
index e6cba50..3d03b8f 100644
--- a/clang/test/SemaObjC/property-7.m
+++ b/clang/test/SemaObjC/property-7.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
typedef signed char BOOL;
typedef struct _NSZone NSZone;
diff --git a/clang/test/SemaObjC/property-8.m b/clang/test/SemaObjC/property-8.m
index 8647aba..da97ffc 100644
--- a/clang/test/SemaObjC/property-8.m
+++ b/clang/test/SemaObjC/property-8.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
typedef signed char BOOL;
typedef unsigned int NSUInteger;
typedef struct _NSZone NSZone;
diff --git a/clang/test/SemaObjC/property-9-impl-method.m b/clang/test/SemaObjC/property-9-impl-method.m
index 84eb363..d6220f6 100644
--- a/clang/test/SemaObjC/property-9-impl-method.m
+++ b/clang/test/SemaObjC/property-9-impl-method.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 %s -fsyntax-only -verify
+// expected-no-diagnostics
// rdar://5967199
typedef signed char BOOL;
diff --git a/clang/test/SemaObjC/property-and-ivar-use.m b/clang/test/SemaObjC/property-and-ivar-use.m
index 5b40d85..a997494 100644
--- a/clang/test/SemaObjC/property-and-ivar-use.m
+++ b/clang/test/SemaObjC/property-and-ivar-use.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// Do not issue error if 'ivar' used previously belongs to the inherited class
// and has same name as @dynalic property in current class.
diff --git a/clang/test/SemaObjC/property-dot-receiver.m b/clang/test/SemaObjC/property-dot-receiver.m
index c5a928b..4a5f195 100644
--- a/clang/test/SemaObjC/property-dot-receiver.m
+++ b/clang/test/SemaObjC/property-dot-receiver.m
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
// RUN: %clang_cc1 -x objective-c++ -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://8962253
@interface Singleton {
diff --git a/clang/test/SemaObjC/property-method-lookup-impl.m b/clang/test/SemaObjC/property-method-lookup-impl.m
index 19d4e68..dc490ed 100644
--- a/clang/test/SemaObjC/property-method-lookup-impl.m
+++ b/clang/test/SemaObjC/property-method-lookup-impl.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
@interface SSyncCEList
{
diff --git a/clang/test/SemaObjC/property-nonfragile-abi.m b/clang/test/SemaObjC/property-nonfragile-abi.m
index 55bf91f..3684cb0 100644
--- a/clang/test/SemaObjC/property-nonfragile-abi.m
+++ b/clang/test/SemaObjC/property-nonfragile-abi.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
typedef signed char BOOL;
diff --git a/clang/test/SemaObjC/property-noprotocol-warning.m b/clang/test/SemaObjC/property-noprotocol-warning.m
index 71bb86a..e4752c5 100644
--- a/clang/test/SemaObjC/property-noprotocol-warning.m
+++ b/clang/test/SemaObjC/property-noprotocol-warning.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@interface Object
diff --git a/clang/test/SemaObjC/property-redundant-decl-accessor.m b/clang/test/SemaObjC/property-redundant-decl-accessor.m
index 3b0e825..6ff2cea 100644
--- a/clang/test/SemaObjC/property-redundant-decl-accessor.m
+++ b/clang/test/SemaObjC/property-redundant-decl-accessor.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -Werror -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
@interface MyClass {
const char *_myName;
diff --git a/clang/test/SemaObjC/property-weak.m b/clang/test/SemaObjC/property-weak.m
index a4397a6..d57774b 100644
--- a/clang/test/SemaObjC/property-weak.m
+++ b/clang/test/SemaObjC/property-weak.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -triple i386-apple-darwin9 -fsyntax-only -verify %s
+// expected-no-diagnostics
@interface foo
@property(nonatomic) int foo __attribute__((weak_import));
diff --git a/clang/test/SemaObjC/props-on-prots.m b/clang/test/SemaObjC/props-on-prots.m
index c01e833..6962d6f 100644
--- a/clang/test/SemaObjC/props-on-prots.m
+++ b/clang/test/SemaObjC/props-on-prots.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
typedef signed char BOOL;
@class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
diff --git a/clang/test/SemaObjC/protocol-expr-1.m b/clang/test/SemaObjC/protocol-expr-1.m
index fe01d1d..94a0d9e 100644
--- a/clang/test/SemaObjC/protocol-expr-1.m
+++ b/clang/test/SemaObjC/protocol-expr-1.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@protocol fproto;
diff --git a/clang/test/SemaObjC/protocol-implementation-inherited.m b/clang/test/SemaObjC/protocol-implementation-inherited.m
index c333bb5..45010d5 100644
--- a/clang/test/SemaObjC/protocol-implementation-inherited.m
+++ b/clang/test/SemaObjC/protocol-implementation-inherited.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@protocol P0
-bar;
diff --git a/clang/test/SemaObjC/protocol-lookup-2.m b/clang/test/SemaObjC/protocol-lookup-2.m
index bf07523..9e8ed8a 100644
--- a/clang/test/SemaObjC/protocol-lookup-2.m
+++ b/clang/test/SemaObjC/protocol-lookup-2.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@interface NSObject @end
@protocol ProtocolA
diff --git a/clang/test/SemaObjC/protocol-lookup.m b/clang/test/SemaObjC/protocol-lookup.m
index ed3fbe0..26718ae 100644
--- a/clang/test/SemaObjC/protocol-lookup.m
+++ b/clang/test/SemaObjC/protocol-lookup.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@protocol NSObject
- retain;
- release;
diff --git a/clang/test/SemaObjC/protocol-qualified-class-unsupported.m b/clang/test/SemaObjC/protocol-qualified-class-unsupported.m
index 4bf6b28..777084d 100644
--- a/clang/test/SemaObjC/protocol-qualified-class-unsupported.m
+++ b/clang/test/SemaObjC/protocol-qualified-class-unsupported.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
#include <stddef.h>
diff --git a/clang/test/SemaObjC/rdar6248119.m b/clang/test/SemaObjC/rdar6248119.m
index 046992c..a495978 100644
--- a/clang/test/SemaObjC/rdar6248119.m
+++ b/clang/test/SemaObjC/rdar6248119.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only %s -verify -fobjc-exceptions
+// expected-no-diagnostics
// Test case for:
// <rdar://problem/6248119> @finally doesn't introduce a new scope
diff --git a/clang/test/SemaObjC/restrict-id-type.m b/clang/test/SemaObjC/restrict-id-type.m
index b24fcb0..24f74c9 100644
--- a/clang/test/SemaObjC/restrict-id-type.m
+++ b/clang/test/SemaObjC/restrict-id-type.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -std=gnu99 -fsyntax-only -verify %s
+// expected-no-diagnostics
void f0(restrict id a0) {}
diff --git a/clang/test/SemaObjC/selector-1.m b/clang/test/SemaObjC/selector-1.m
index 16d44cb..186e19f 100644
--- a/clang/test/SemaObjC/selector-1.m
+++ b/clang/test/SemaObjC/selector-1.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -verify %s
+// expected-no-diagnostics
@interface I
- (id) compare: (char) arg1;
diff --git a/clang/test/SemaObjC/selector-2.m b/clang/test/SemaObjC/selector-2.m
index fb75369..17d1872 100644
--- a/clang/test/SemaObjC/selector-2.m
+++ b/clang/test/SemaObjC/selector-2.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -Wselector -verify %s
+// expected-no-diagnostics
// rdar://8851684
@interface I
- length;
diff --git a/clang/test/SemaObjC/self-declared-in-block.m b/clang/test/SemaObjC/self-declared-in-block.m
index 40a0331..36a9ef5 100644
--- a/clang/test/SemaObjC/self-declared-in-block.m
+++ b/clang/test/SemaObjC/self-declared-in-block.m
@@ -1,5 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -triple x86_64-apple-darwin10 -fblocks -verify -Wno-objc-root-class %s
// RUN: %clang_cc1 -x objective-c++ -fsyntax-only -triple x86_64-apple-darwin10 -fblocks -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://9154582
@interface Blocky @end
diff --git a/clang/test/SemaObjC/self-in-function.m b/clang/test/SemaObjC/self-in-function.m
index 9027a94..a14ad90 100644
--- a/clang/test/SemaObjC/self-in-function.m
+++ b/clang/test/SemaObjC/self-in-function.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -fblocks -verify %s
+// expected-no-diagnostics
// rdar://9181463
typedef struct objc_class *Class;
diff --git a/clang/test/SemaObjC/setter-dotsyntax.m b/clang/test/SemaObjC/setter-dotsyntax.m
index e0b51e8..ec47ee2 100644
--- a/clang/test/SemaObjC/setter-dotsyntax.m
+++ b/clang/test/SemaObjC/setter-dotsyntax.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
// rdar://8528170
@interface NSObject @end
diff --git a/clang/test/SemaObjC/super-cat-prot.m b/clang/test/SemaObjC/super-cat-prot.m
index 3e28986..fd93994 100644
--- a/clang/test/SemaObjC/super-cat-prot.m
+++ b/clang/test/SemaObjC/super-cat-prot.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
typedef signed char BOOL;
typedef unsigned int NSUInteger;
@class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
diff --git a/clang/test/SemaObjC/super-property-message-expr.m b/clang/test/SemaObjC/super-property-message-expr.m
index c25164e1..81b8f8f 100644
--- a/clang/test/SemaObjC/super-property-message-expr.m
+++ b/clang/test/SemaObjC/super-property-message-expr.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@interface SStoreNodeInfo
diff --git a/clang/test/SemaObjC/super-property-notation.m b/clang/test/SemaObjC/super-property-notation.m
index 7d3f7c7..0c17bb9 100644
--- a/clang/test/SemaObjC/super-property-notation.m
+++ b/clang/test/SemaObjC/super-property-notation.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@interface B
+(int) classGetter;
diff --git a/clang/test/SemaObjC/synth-provisional-ivars-1.m b/clang/test/SemaObjC/synth-provisional-ivars-1.m
index 0e155f4..92a9d71 100644
--- a/clang/test/SemaObjC/synth-provisional-ivars-1.m
+++ b/clang/test/SemaObjC/synth-provisional-ivars-1.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -fobjc-default-synthesize-properties -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
// rdar://8913053
typedef unsigned char BOOL;
diff --git a/clang/test/SemaObjC/synthesize-setter-contclass.m b/clang/test/SemaObjC/synthesize-setter-contclass.m
index d754415..df954db2d 100644
--- a/clang/test/SemaObjC/synthesize-setter-contclass.m
+++ b/clang/test/SemaObjC/synthesize-setter-contclass.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
@interface TestClass
{
diff --git a/clang/test/SemaObjC/transparent-union.m b/clang/test/SemaObjC/transparent-union.m
index 6f2dbf9..bda0a54 100644
--- a/clang/test/SemaObjC/transparent-union.m
+++ b/clang/test/SemaObjC/transparent-union.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wno-objc-root-class %s
+// expected-no-diagnostics
typedef union {
struct xx_object_s *_do;
diff --git a/clang/test/SemaObjC/ucn-objc-string.m b/clang/test/SemaObjC/ucn-objc-string.m
index 6070278..f80d1ff 100644
--- a/clang/test/SemaObjC/ucn-objc-string.m
+++ b/clang/test/SemaObjC/ucn-objc-string.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 %s -verify -fsyntax-only
+// expected-no-diagnostics
@class NSString;
extern void NSLog(NSString *format, ...) __attribute__((format(__NSString__, 1, 2)));
diff --git a/clang/test/SemaObjC/va-method-1.m b/clang/test/SemaObjC/va-method-1.m
index fe7ccd7..4959df3 100644
--- a/clang/test/SemaObjC/va-method-1.m
+++ b/clang/test/SemaObjC/va-method-1.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
#include <stdarg.h>
diff --git a/clang/test/SemaObjC/writable-property-in-superclass.m b/clang/test/SemaObjC/writable-property-in-superclass.m
index bbd1f16..99be541 100644
--- a/clang/test/SemaObjC/writable-property-in-superclass.m
+++ b/clang/test/SemaObjC/writable-property-in-superclass.m
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
+// expected-no-diagnostics
@interface MessageStore
@property (assign, readonly) int P;