aboutsummaryrefslogtreecommitdiff
path: root/test/ASTMerge/interface.m
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-02-17 16:12:00 +0000
committerDouglas Gregor <dgregor@apple.com>2010-02-17 16:12:00 +0000
commit2e2a400383c7a64a927f61eeed596b08928e1d4b (patch)
tree1b10dfa79d3f1e0060ed79b854640bf14d6c5617 /test/ASTMerge/interface.m
parentdf3a61bb5148361254c253eccd91aa4517cc8eaa (diff)
AST import for Objective-C protocols
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@96478 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ASTMerge/interface.m')
-rw-r--r--test/ASTMerge/interface.m4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/ASTMerge/interface.m b/test/ASTMerge/interface.m
index 465077b420..47e4e05269 100644
--- a/test/ASTMerge/interface.m
+++ b/test/ASTMerge/interface.m
@@ -13,5 +13,7 @@
// CHECK: interface1.m:40:17: note: declared here with type 'int'
// CHECK: interface2.m:45:1: error: class method 'bar:' is variadic in one translation unit and not variadic in another
// CHECK: interface1.m:46:1: note: class method 'bar:' also declared here
-// CHECK: 11 diagnostics generated
+// CHECK: interface2.m:57:20: error: instance method 'bar:' has a parameter with a different types in different translation units ('double' vs. 'float')
+// CHECK: interface1.m:58:19: note: declared here with type 'float'
+// CHECK: 13 diagnostics generated