diff options
| author | Reid Kleckner <rnk@google.com> | 2019-05-14 19:02:39 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2019-05-14 19:02:39 +0000 |
| commit | 2423b7dfd3d2b10cffd4b93e904963763bc0a1f4 (patch) | |
| tree | 31e2d700e567897cc6ffa620d6e07ca978edbfd7 /clang/test/ASTMerge/interface/test.m | |
| parent | 48c4e4fa802bba66e9de087cc5281ac5a82def95 (diff) | |
| download | bcm5719-llvm-2423b7dfd3d2b10cffd4b93e904963763bc0a1f4.tar.gz bcm5719-llvm-2423b7dfd3d2b10cffd4b93e904963763bc0a1f4.zip | |
Update ASTMerge FileCheck test expectations
I belive many of these diagnostics changed from errors to warnings in
r357394. I've simply mechanically updated the tests, but whoever owns
this code should probably audit for unintented behavior changes. I
wasn't able to find a flag to make these warnings errors again.
llvm-svn: 360701
Diffstat (limited to 'clang/test/ASTMerge/interface/test.m')
| -rw-r--r-- | clang/test/ASTMerge/interface/test.m | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/clang/test/ASTMerge/interface/test.m b/clang/test/ASTMerge/interface/test.m index 7338e903f1e..229a334c41a 100644 --- a/clang/test/ASTMerge/interface/test.m +++ b/clang/test/ASTMerge/interface/test.m @@ -1,24 +1,22 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/interface1.m // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/interface2.m -// RUN: not %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s -// CHECK: interface2.m:16:9: error: instance variable 'ivar2' declared with incompatible types in different translation units ('float' vs. 'int') +// CHECK: interface2.m:16:9: warning: instance variable 'ivar2' declared with incompatible types in different translation units ('float' vs. 'int') // CHECK: interface1.m:16:7: note: declared here with type 'int' -// CHECK: interface1.m:21:12: error: class 'I4' has incompatible superclasses +// CHECK: interface1.m:21:12: warning: class 'I4' has incompatible superclasses // CHECK: interface1.m:21:17: note: inherits from superclass 'I2' here // CHECK: interface2.m:21:17: note: inherits from superclass 'I1' here -// CHECK: interface2.m:33:1: error: class method 'foo' has incompatible result types in different translation units ('float' vs. 'int') +// CHECK: interface2.m:33:1: warning: class method 'foo' has incompatible result types in different translation units ('float' vs. 'int') // CHECK: interface1.m:34:1: note: class method 'foo' also declared here -// CHECK: interface2.m:39:19: error: class method 'bar:' has a parameter with a different types in different translation units ('float' vs. 'int') +// CHECK: interface2.m:39:19: warning: class method 'bar:' has a parameter with a different types in different translation units ('float' vs. 'int') // 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: interface2.m:45:1: warning: 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: interface2.m:57:20: error: instance method 'bar:' has a parameter with a different types in different translation units ('double' vs. 'float') +// CHECK: interface2.m:57:20: warning: 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: interface1.m:100:17: error: class 'I15' has incompatible superclasses +// CHECK: interface1.m:100:17: warning: class 'I15' has incompatible superclasses // CHECK: interface1.m:100:17: note: inherits from superclass 'I12' here // CHECK: interface2.m:99:17: note: inherits from superclass 'I11' here -// CHECK: 8 errors generated +// CHECK: 8 warnings generated |
