1 files changed, 0 insertions, 48 deletions
diff --git a/clang/test/SemaObjC/qualified-protocol-method-conflicts.m b/clang/test/SemaObjC/qualified-protocol-method-conflicts.m
deleted file mode 100644
index 06bf32be3e9..00000000000
--- a/clang/test/SemaObjC/qualified-protocol-method-conflicts.m
+++ /dev/null
@@ -1,48 +0,0 @@
-// RUN: %clang_cc1  -fsyntax-only -verify %s
-// rdar://6191214
-// XFAIL: *
-
-// *** Currently marked XFAIL since the output is nondeterministic. ***
-
-int x = "hello"; // *** ADDED TO MAKE THIS TEST ALWAYS FAIL.  WILL REMOVE WHEN OUTPUT IS STABLE. ***
-
-@protocol Xint
--(void) setX: (int) arg0; // expected-warning 2 {{conflicting parameter types in declaration of 'setX:': 'float' vs 'int'}} \
-                          // expected-note {{previous definition is here}}
-+(int) C; // expected-warning 2 {{conflicting return type in declaration of 'C': 'float' vs 'int'}} \
-          // expected-note {{previous definition is here}}
-@end
-
-@protocol Xfloat
--(void) setX: (float) arg0; // expected-note 2 {{previous definition is here}} \
-                            // expected-warning {{conflicting parameter types in declaration of 'setX:': 'int' vs 'float'}}
-+(float) C; // expected-warning {{conflicting return type in declaration of 'C': 'int' vs 'float'}} \
-            // expected-note 2 {{previous definition is here}}
-@end
-
-@interface A <Xint, Xfloat> // expected-note {{class is declared here}}
-@end
-
-@implementation A
--(void) setX: (int) arg0 { }
-+(int) C {return 0; }
-@end
-
-@interface B <Xfloat, Xint> // expected-note {{class is declared here}}
-@end
-
-@implementation B 
--(void) setX: (float) arg0 { }
-+ (float) C {return 0.0; }
-@end
-
-@protocol Xint_float<Xint, Xfloat>
-@end
-
-@interface C<Xint_float> // expected-note {{class is declared here}}
-@end
-
-@implementation C
--(void) setX: (int) arg0 { }
-+ (int) C {return 0;}
-@end