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/category/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/category/test.m')
| -rw-r--r-- | clang/test/ASTMerge/category/test.m | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/clang/test/ASTMerge/category/test.m b/clang/test/ASTMerge/category/test.m index bee72f67560..c44a3b8324f 100644 --- a/clang/test/ASTMerge/category/test.m +++ b/clang/test/ASTMerge/category/test.m @@ -1,13 +1,11 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/category1.m // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/category2.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: category2.m:18:1: error: instance method 'method2' has incompatible result types in different translation units ('float' vs. 'int') +// CHECK: category2.m:18:1: warning: instance method 'method2' has incompatible result types in different translation units ('float' vs. 'int') // CHECK: category1.m:16:1: note: instance method 'method2' also declared here -// CHECK: category2.m:26:1: error: instance method 'method3' has incompatible result types in different translation units ('float' vs. 'int') +// CHECK: category2.m:26:1: warning: instance method 'method3' has incompatible result types in different translation units ('float' vs. 'int') // CHECK: category1.m:24:1: note: instance method 'method3' also declared here -// CHECK: category2.m:48:1: error: instance method 'blah' has incompatible result types in different translation units ('int' vs. 'float') +// CHECK: category2.m:48:1: warning: instance method 'blah' has incompatible result types in different translation units ('int' vs. 'float') // CHECK: category1.m:46:1: note: instance method 'blah' also declared here -// CHECK: 3 errors generated. +// CHECK: 3 warnings generated. |
