Try to disable this again.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116094 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/ASTMerge/class.cpp b/test/ASTMerge/class.cpp
index 1de94dd90e8f41f5e8a0182dfdeb87db988349aa..01371082842f7ddd52bea9ce0758f31f5b93286f 100644 (file)
--- a/test/ASTMerge/class.cpp
+++ b/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