Try to disable this again.

llvm-svn: 116094

Author: echristo

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