diff options
Diffstat (limited to 'clang/test/ASTMerge/function/test.c')
| -rw-r--r-- | clang/test/ASTMerge/function/test.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/clang/test/ASTMerge/function/test.c b/clang/test/ASTMerge/function/test.c index 8d4d0c15f2e..3556347366a 100644 --- a/clang/test/ASTMerge/function/test.c +++ b/clang/test/ASTMerge/function/test.c @@ -1,17 +1,15 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/function1.c // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/function2.c -// 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 // RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only -verify %s -// CHECK: function2.c:3:6: error: external function 'f1' declared with incompatible types in different translation units ('void (Int, double)' (aka 'void (int, double)') vs. 'void (int, float)') +// CHECK: function2.c:3:6: warning: external function 'f1' declared with incompatible types in different translation units ('void (Int, double)' (aka 'void (int, double)') vs. 'void (int, float)') // CHECK: function1.c:2:6: note: declared here with type 'void (int, float)' -// CHECK: function2.c:5:6: error: external function 'f3' declared with incompatible types in different translation units ('void (int)' vs. 'void (void)') +// CHECK: function2.c:5:6: warning: external function 'f3' declared with incompatible types in different translation units ('void (int)' vs. 'void (void)') // CHECK: function1.c:4:6: note: declared here with type 'void (void)' -// CHECK: 2 errors generated +// CHECK: 2 warnings generated -// expected-error@Inputs/function2.c:3 {{external function 'f1' declared with incompatible types}} +// expected-warning@Inputs/function2.c:3 {{external function 'f1' declared with incompatible types}} // expected-note@Inputs/function1.c:2 {{declared here}} -// expected-error@Inputs/function2.c:5 {{external function 'f3' declared with incompatible types}} +// expected-warning@Inputs/function2.c:5 {{external function 'f3' declared with incompatible types}} // expected-note@Inputs/function1.c:4 {{declared here}} |
