9 files changed, 18 insertions, 18 deletions
diff --git a/debuginfo-tests/block_var.m b/debuginfo-tests/block_var.m
index a1c94c88513..367526910a3 100644
--- a/debuginfo-tests/block_var.m
+++ b/debuginfo-tests/block_var.m
@@ -1,8 +1,8 @@
 // RUN: %clang -O0 -g %s -c -o %t.o
 // RUN: %clang %t.o -o %t.out -framework Foundation
 // RUN: %test_debuginfo %s %t.out 
-// XFAIL: *
-// XTARGET: darwin
+
+// REQUIRES: system-darwin
 
 // DEBUGGER: break 24
 // DEBUGGER: r
diff --git a/debuginfo-tests/blocks.m b/debuginfo-tests/blocks.m
index 84610419c71..30472ed3bd1 100644
--- a/debuginfo-tests/blocks.m
+++ b/debuginfo-tests/blocks.m
@@ -1,8 +1,8 @@
 // RUN: %clang -O0 -g %s -c -o %t.o
 // RUN: %clang %t.o -o %t.out -framework Foundation
 // RUN: %test_debuginfo %s %t.out 
-// XFAIL: *
-// XTARGET: darwin
+
+// REQUIRES: system-darwin
 // Radar 9279956
 
 // DEBUGGER: break 31
diff --git a/debuginfo-tests/dbg-arg.ll b/debuginfo-tests/dbg-arg.ll
index 52f36858e79..bfa1f8ddc71 100644
--- a/debuginfo-tests/dbg-arg.ll
+++ b/debuginfo-tests/dbg-arg.ll
@@ -2,8 +2,8 @@
 ; RUN: %clang -arch x86_64 -mllvm -fast-isel=false  %s -c -o %t.o
 ; RUN: %clang -arch x86_64 %t.o -o %t.out
 ; RUN: %test_debuginfo %s %t.out
-; XFAIL: *
-; XTARGET: darwin
+;
+; REQUIRES: system-darwin
 ; Radar 8412415
 
 target triple = "x86_64-apple-darwin10.0.0"
diff --git a/debuginfo-tests/dbg-declare.ll b/debuginfo-tests/dbg-declare.ll
index b520c68a5fa..84b1514670c 100644
--- a/debuginfo-tests/dbg-declare.ll
+++ b/debuginfo-tests/dbg-declare.ll
@@ -2,8 +2,8 @@
 ; RUN: %clang -arch x86_64 -O0 -g %s -c -o %t.o
 ; RUN: %clang -arch x86_64 %t.o -o %t.out
 ; RUN: %test_debuginfo %s %t.out
-; XFAIL: *
-; XTARGET: darwin
+;
+; REQUIRES: system-darwin
 
 target triple = "x86_64-apple-darwin" 
 %struct.XYZ = type { i32, i32, i32, i32, i32 }
diff --git a/debuginfo-tests/dbg-declare2.ll b/debuginfo-tests/dbg-declare2.ll
index f8155b816e5..ec0d03b83c7 100644
--- a/debuginfo-tests/dbg-declare2.ll
+++ b/debuginfo-tests/dbg-declare2.ll
@@ -2,8 +2,8 @@
 ; RUN: %clang -arch x86_64 -mllvm -fast-isel=false -mllvm -regalloc=default -g %s -c -o %t.o
 ; RUN: %clang -arch x86_64 %t.o -o %t.out
 ; RUN: %test_debuginfo %s %t.out
-; XFAIL: *
-; XTARGET: darwin
+;
+; REQUIRES: system-darwin
 
 target triple = "x86_64-apple-darwin"
 %struct.XYZ = type { i32, i32, i32, i32, i32 }
diff --git a/debuginfo-tests/foreach.m b/debuginfo-tests/foreach.m
index 96a0d0cd13f..50e6af9bfce 100644
--- a/debuginfo-tests/foreach.m
+++ b/debuginfo-tests/foreach.m
@@ -1,8 +1,8 @@
 // RUN: %clang -O0 -g %s -c -o %t.o
 // RUN: %clang %t.o -o %t.out -framework Foundation
 // RUN: %test_debuginfo %s %t.out 
-// XFAIL: *
-// XTARGET: darwin
+//
+// REQUIRES: system-darwin
 // Radar 8757124
 
 // DEBUGGER: break 25
diff --git a/debuginfo-tests/local-var.ll b/debuginfo-tests/local-var.ll
index ecec8c7ee89..2db47340f11 100644
--- a/debuginfo-tests/local-var.ll
+++ b/debuginfo-tests/local-var.ll
@@ -2,8 +2,8 @@
 ; RUN: %clang -arch x86_64 -O0 -g %s -c -o %t.o
 ; RUN: %clang -arch x86_64 %t.o -o %t.out
 ; RUN: %test_debuginfo %s %t.out
-; XFAIL: *
-; XTARGET: darwin
+;
+; REQUIRES: system-darwin
 
 target triple = "x86_64-apple-darwin10.0.0"
 
diff --git a/debuginfo-tests/local-var2.ll b/debuginfo-tests/local-var2.ll
index 37c7a31424a..6f159f35133 100644
--- a/debuginfo-tests/local-var2.ll
+++ b/debuginfo-tests/local-var2.ll
@@ -2,8 +2,8 @@
 ; RUN: %clang -arch x86_64 -O0 -mllvm -fast-isel=false -g %s -c -o %t.o
 ; RUN: %clang -arch x86_64 %t.o -o %t.out
 ; RUN: %test_debuginfo %s %t.out
-; XFAIL: *
-; XTARGET: darwin
+;
+; REQUIRES: system-darwin
 
 target triple = "x86_64-apple-darwin10.0.0"
 
diff --git a/debuginfo-tests/unused-boolean-arg.ll b/debuginfo-tests/unused-boolean-arg.ll
index 77c31f5e755..165ab77023d 100644
--- a/debuginfo-tests/unused-boolean-arg.ll
+++ b/debuginfo-tests/unused-boolean-arg.ll
@@ -2,8 +2,8 @@
 ; RUN: %clang -arch x86_64 -mllvm -fast-isel=false  %s -c -o %t.o
 ; RUN: %clang -arch x86_64 %t.o -o %t.out
 ; RUN: %test_debuginfo %s %t.out
-; XFAIL: *
-; XTARGET: darwin
+;
+; REQUIRES: system-darwin
 ; Radar 9422775
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"