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/namespace/test.cpp | |
| 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/namespace/test.cpp')
| -rw-r--r-- | clang/test/ASTMerge/namespace/test.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/clang/test/ASTMerge/namespace/test.cpp b/clang/test/ASTMerge/namespace/test.cpp index f0f8b73ffcb..5e0d9ee510f 100644 --- a/clang/test/ASTMerge/namespace/test.cpp +++ b/clang/test/ASTMerge/namespace/test.cpp @@ -1,5 +1,3 @@ -// FIXME: Errors are now warnings. -// XFAIL: * // RUN: %clang_cc1 -emit-pch -std=c++1z -o %t.1.ast %S/Inputs/namespace1.cpp // RUN: %clang_cc1 -emit-pch -std=c++1z -o %t.2.ast %S/Inputs/namespace2.cpp // RUN: not %clang_cc1 -std=c++1z -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s @@ -15,5 +13,5 @@ void testImport() { } -// CHECK: namespace2.cpp:16:17: error: external variable 'z' declared with incompatible types in different translation units ('double' vs. 'float') +// CHECK: namespace2.cpp:16:17: warning: external variable 'z' declared with incompatible types in different translation units ('double' vs. 'float') // CHECK: namespace1.cpp:16:16: note: declared here with type 'float' |
