From 9257db56226b346c4fb27618a8e25f869a31041b Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Sun, 12 Apr 2009 08:46:44 +0000
Subject: [PATCH] merge protocol-test-1.m -> protocol-test-2.m

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68897 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/SemaObjC/protocol-test-1.m | 20 --------------------
 test/SemaObjC/protocol-test-2.m | 18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 22 deletions(-)
 delete mode 100644 test/SemaObjC/protocol-test-1.m

diff --git a/test/SemaObjC/protocol-test-1.m b/test/SemaObjC/protocol-test-1.m
deleted file mode 100644
index 6ca2bb875b..0000000000
--- a/test/SemaObjC/protocol-test-1.m
+++ /dev/null
@@ -1,20 +0,0 @@
-// RUN: clang-cc -fsyntax-only -verify %s
-
-@protocol PROTO1
-@required 
-- (int) FooBar;
-@optional
-- (void) MyMethod1;
-+ (int) S;
-@end
-
-@interface INTF1
-@required  // expected-error {{directive may only be specified in protocols only}}
-- (int) FooBar;
-- (int) FooBar1;
-- (int) FooBar2;
-@optional  // expected-error {{directive may only be specified in protocols only}}
-+ (int) C;
-
-- (int)I;
-@end
diff --git a/test/SemaObjC/protocol-test-2.m b/test/SemaObjC/protocol-test-2.m
index 1ccc2de93e..9fbdc16759 100644
--- a/test/SemaObjC/protocol-test-2.m
+++ b/test/SemaObjC/protocol-test-2.m
@@ -1,15 +1,29 @@
 // RUN: clang-cc -fsyntax-only -verify %s
 
-@interface INTF1 @end
+@interface INTF1
+@required  // expected-error {{directive may only be specified in protocols only}}
+- (int) FooBar;
+- (int) FooBar1;
+- (int) FooBar2;
+@optional  // expected-error {{directive may only be specified in protocols only}}
++ (int) C;
+
+- (int)I;
+@end
 
 @protocol p1,p2,p3;
 
 @protocol p1;
 
 @protocol PROTO1
-- (INTF1<p1>*) meth;
+@required 
+- (int) FooBar;
+@optional
+- (void) MyMethod1;
++ (int) S;
 @end
 
+
 @protocol PROTO2<p1>
 @end
 
-- 
2.40.0