aboutsummaryrefslogtreecommitdiff
path: root/test/ASTMerge/property.m
diff options
context:
space:
mode:
Diffstat (limited to 'test/ASTMerge/property.m')
-rw-r--r--test/ASTMerge/property.m6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/ASTMerge/property.m b/test/ASTMerge/property.m
index 5f7a7308da..a8dd7c420c 100644
--- a/test/ASTMerge/property.m
+++ b/test/ASTMerge/property.m
@@ -6,4 +6,8 @@
// CHECK: property1.m:10:28: note: declared here with type 'float'
// CHECK: property2.m:12:26: error: instance method 'Prop1' has incompatible result types in different translation units ('int' vs. 'float')
// CHECK: property1.m:10:28: note: instance method 'Prop1' also declared here
-// CHECK: 2 errors generated.
+// CHECK: property1.m:28:21: error: property 'Prop2' is synthesized to different ivars in different translation units ('ivar3' vs. 'ivar2')
+// CHECK: property2.m:29:21: note: property is synthesized to ivar 'ivar2' here
+// CHECK: property1.m:29:10: error: property 'Prop3' is implemented with @dynamic in one translation but @synthesize in another translation unit
+// CHECK: property2.m:31:13: note: property 'Prop3' is implemented with @synthesize here
+// CHECK: 4 errors generated.