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/enum | |
| 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/enum')
| -rw-r--r-- | clang/test/ASTMerge/enum/test.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/clang/test/ASTMerge/enum/test.c b/clang/test/ASTMerge/enum/test.c index 57f92787575..9a01065c6e1 100644 --- a/clang/test/ASTMerge/enum/test.c +++ b/clang/test/ASTMerge/enum/test.c @@ -1,27 +1,25 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/enum1.c // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/enum2.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 // CHECK: enum1.c:9:6: warning: type 'enum E2' has incompatible definitions in different translation units // CHECK: enum1.c:11:3: note: enumerator 'E2Enumerator2' with value 3 here // CHECK: enum2.c:11:3: note: enumerator 'E2Enumerator2' with value 4 here -// CHECK: enum2.c:13:3: error: external variable 'x2' declared with incompatible types in different translation units ('enum E2' vs. 'enum E2') +// CHECK: enum2.c:13:3: warning: external variable 'x2' declared with incompatible types in different translation units ('enum E2' vs. 'enum E2') // CHECK: enum1.c:13:3: note: declared here with type 'enum E2' // CHECK: enum1.c:16:6: warning: type 'enum E3' has incompatible definitions in different translation units // CHECK: enum1.c:18:3: note: enumerator 'E3Enumerator2' with value 3 here // CHECK: enum2.c:18:3: note: enumerator 'E3Enumerator' with value 3 here -// CHECK: enum2.c:20:3: error: external variable 'x3' declared with incompatible types in different translation units ('enum E3' vs. 'enum E3') +// CHECK: enum2.c:20:3: warning: external variable 'x3' declared with incompatible types in different translation units ('enum E3' vs. 'enum E3') // CHECK: enum1.c:20:3: note: declared here with type 'enum E3' // CHECK: enum1.c:23:6: warning: type 'enum E4' has incompatible definitions in different translation units // CHECK: enum1.c:26:3: note: enumerator 'E4Enumerator3' with value 2 here // CHECK: enum2.c:23:6: note: no corresponding enumerator here -// CHECK: enum2.c:26:3: error: external variable 'x4' declared with incompatible types in different translation units ('enum E4' vs. 'enum E4') +// CHECK: enum2.c:26:3: warning: external variable 'x4' declared with incompatible types in different translation units ('enum E4' vs. 'enum E4') // CHECK: enum1.c:27:3: note: declared here with type 'enum E4' // CHECK: enum1.c:30:6: warning: type 'enum E5' has incompatible definitions in different translation units // CHECK: enum2.c:33:3: note: enumerator 'E5Enumerator4' with value 3 here // CHECK: enum1.c:30:6: note: no corresponding enumerator here -// CHECK: enum2.c:34:3: error: external variable 'x5' declared with incompatible types in different translation units ('enum E5' vs. 'enum E5') +// CHECK: enum2.c:34:3: warning: external variable 'x5' declared with incompatible types in different translation units ('enum E5' vs. 'enum E5') // CHECK: enum1.c:34:3: note: declared here with type 'enum E5' -// CHECK: 4 warnings and 4 errors generated +// CHECK: 8 warnings generated |
