Author: echristo
Date: Fri Oct 8 14:36:36 2010
New Revision: 116094
URL: http://llvm.org/viewvc/llvm-project?rev=116094&view=rev
Log:
Try to disable this again.
Modified:
cfe/trunk/test/ASTMerge/class.cpp
Modified: cfe/trunk/test/ASTMerge/class.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ASTMerge/class.cpp?rev=116094&r1=116093&r2=116094&view=diff
==============================================================================
--- cfe/trunk/test/ASTMerge/class.cpp (original)
+++ cfe/trunk/test/ASTMerge/class.cpp Fri Oct 8 14:36:36 2010
@@ -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
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
