diff options
| author | Eric Christopher <echristo@apple.com> | 2010-10-08 19:36:36 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2010-10-08 19:36:36 +0000 |
| commit | 366c146e79ad9ac7e069048a5c167df1f14c5534 (patch) | |
| tree | afb4771e187009d4936a0a95cf5c5521fba2884b /clang/test/ASTMerge/class.cpp | |
| parent | 2fd85d7cd2c77d948e10d65c8e468ea1c0865b54 (diff) | |
| download | bcm5719-llvm-366c146e79ad9ac7e069048a5c167df1f14c5534.tar.gz bcm5719-llvm-366c146e79ad9ac7e069048a5c167df1f14c5534.zip | |
Try to disable this again.
llvm-svn: 116094
Diffstat (limited to 'clang/test/ASTMerge/class.cpp')
| -rw-r--r-- | clang/test/ASTMerge/class.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/clang/test/ASTMerge/class.cpp b/clang/test/ASTMerge/class.cpp index 1de94dd90e8..01371082842 100644 --- a/clang/test/ASTMerge/class.cpp +++ b/clang/test/ASTMerge/class.cpp @@ -1,6 +1,8 @@ -// XRUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/class1.cpp -// XRUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/class2.cpp -// XRUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/class1.cpp +// RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/class2.cpp +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s +// RUN: false +// XFAIL: * // CHECK: class1.cpp:5:8: warning: type 'B' has incompatible definitions in different translation units // CHECK: class1.cpp:6:9: note: field 'y' has type 'float' here |
