5 files changed, 13 insertions, 9 deletions
diff --git a/clang/test/Coverage/codegen-gnu.m b/clang/test/Coverage/codegen-gnu.m
new file mode 100644
index 00000000000..63cd4685052
--- /dev/null
+++ b/clang/test/Coverage/codegen-gnu.m
@@ -0,0 +1,5 @@
+// RUN: clang -fgnu-runtime -emit-llvm -o %t %s &&
+// RUN: clang -g -fgnu-runtime -emit-llvm -o %t %s
+// XFAIL
+
+#include "objc-language-features.inc"
diff --git a/clang/test/Coverage/codegen-next.m b/clang/test/Coverage/codegen-next.m
new file mode 100644
index 00000000000..74df555d108
--- /dev/null
+++ b/clang/test/Coverage/codegen-next.m
@@ -0,0 +1,5 @@
+// RUN: clang -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang -g -fnext-runtime -emit-llvm -o %t %s
+// XFAIL
+
+#include "objc-language-features.inc"
diff --git a/clang/test/Coverage/codegen.c b/clang/test/Coverage/codegen.c
index eb2873c7837..8c9ce02d7cf 100644
--- a/clang/test/Coverage/codegen.c
+++ b/clang/test/Coverage/codegen.c
@@ -1,4 +1,5 @@
-// RUN: clang -emit-llvm -o %t %s
-// RUN: clang -emit-llvm-bc -o %t %s
+// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang -emit-llvm-bc -o %t %s &&
+// RUN: clang -g -emit-llvm-bc -o %t %s
 
 #include "c-language-features.inc"
diff --git a/clang/test/Coverage/codegen.m b/clang/test/Coverage/codegen.m
deleted file mode 100644
index 9bfdb68d279..00000000000
--- a/clang/test/Coverage/codegen.m
+++ /dev/null
@@ -1,5 +0,0 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
-// RUN: clang -fnext-runtime -emit-llvm-bc -o %t %s
-// XFAIL
-
-#include "objc-language-features.inc"
diff --git a/clang/test/Coverage/objc-language-features.inc b/clang/test/Coverage/objc-language-features.inc
index d341032b82f..87177cf243c 100644
--- a/clang/test/Coverage/objc-language-features.inc
+++ b/clang/test/Coverage/objc-language-features.inc
@@ -39,13 +39,11 @@
 @implementation C : A
 @end
 
-#if 0
 @interface A (Cat)
 @end
 
 @implementation A (Cat)
 @end
-#endif
 
 int f0(id x) {
   @synchronized(x) {