Revert 9 changes from r284793, they still fail on some bots

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

9 files changed, 12 insertions, 9 deletions

diff --git a/test/Driver/rewrite-map-in-diagnostics.c b/test/Driver/rewrite-map-in-diagnostics.c
index 7c5811539e..4aea0ec031 100644
--- a/test/Driver/rewrite-map-in-diagnostics.c
+++ b/test/Driver/rewrite-map-in-diagnostics.c
@@ -9,3 +9,6 @@
 // CHECK: note: diagnostic msg: {{.*}}rewrite.map
 
 // REQUIRES: crash-recovery
+
+// FIXME: This doesn't fail on "env clang". Investigating.
+// REQUIRES: shell
diff --git a/test/OpenMP/task_firstprivate_codegen.cpp b/test/OpenMP/task_firstprivate_codegen.cpp
index b17729312a..0d8e1c4afe 100644
--- a/test/OpenMP/task_firstprivate_codegen.cpp
+++ b/test/OpenMP/task_firstprivate_codegen.cpp
@@ -7,7 +7,7 @@
 // expected-no-diagnostics
 // REQUIRES: x86-registered-target
 // It doesn't pass on win32.
-// XFAIL: win32
+// REQUIRES: shell
 #ifndef ARRAY
 #ifndef HEADER
 #define HEADER
diff --git a/test/OpenMP/task_private_codegen.cpp b/test/OpenMP/task_private_codegen.cpp
index 2e2ae844d2..97155a73f1 100644
--- a/test/OpenMP/task_private_codegen.cpp
+++ b/test/OpenMP/task_private_codegen.cpp
@@ -7,7 +7,7 @@
 // expected-no-diagnostics
 // REQUIRES: x86-registered-target
 // It doesn't pass on win32. Investigating.
-// XFAIL: win32
+// REQUIRES: shell
 
 #ifndef ARRAY
 #ifndef HEADER
diff --git a/test/OpenMP/taskloop_firstprivate_codegen.cpp b/test/OpenMP/taskloop_firstprivate_codegen.cpp
index d6886e3913..822a5c687d 100644
--- a/test/OpenMP/taskloop_firstprivate_codegen.cpp
+++ b/test/OpenMP/taskloop_firstprivate_codegen.cpp
@@ -7,7 +7,7 @@
 // expected-no-diagnostics
 // REQUIRES: x86-registered-target
 // It doesn't pass on win32.
-// XFAIL: win32
+// REQUIRES: shell
 #ifndef ARRAY
 #ifndef HEADER
 #define HEADER
diff --git a/test/OpenMP/taskloop_lastprivate_codegen.cpp b/test/OpenMP/taskloop_lastprivate_codegen.cpp
index c8293ebae8..8414b6f963 100644
--- a/test/OpenMP/taskloop_lastprivate_codegen.cpp
+++ b/test/OpenMP/taskloop_lastprivate_codegen.cpp
@@ -7,7 +7,7 @@
 // expected-no-diagnostics
 // REQUIRES: x86-registered-target
 // It doesn't pass on win32.
-// XFAIL: win32
+// REQUIRES: shell
 #ifndef ARRAY
 #ifndef HEADER
 #define HEADER
diff --git a/test/OpenMP/taskloop_private_codegen.cpp b/test/OpenMP/taskloop_private_codegen.cpp
index 630a5c1202..38b20c5793 100644
--- a/test/OpenMP/taskloop_private_codegen.cpp
+++ b/test/OpenMP/taskloop_private_codegen.cpp
@@ -7,7 +7,7 @@
 // expected-no-diagnostics
 // REQUIRES: x86-registered-target
 // It doesn't pass on win32. Investigating.
-// XFAIL: win32
+// REQUIRES: shell
 
 #ifndef ARRAY
 #ifndef HEADER
diff --git a/test/OpenMP/taskloop_simd_firstprivate_codegen.cpp b/test/OpenMP/taskloop_simd_firstprivate_codegen.cpp
index 01a4f28e5b..0b87ddd9ac 100644
--- a/test/OpenMP/taskloop_simd_firstprivate_codegen.cpp
+++ b/test/OpenMP/taskloop_simd_firstprivate_codegen.cpp
@@ -7,7 +7,7 @@
 // expected-no-diagnostics
 // REQUIRES: x86-registered-target
 // It doesn't pass on win32.
-// XFAIL: win32
+// REQUIRES: shell
 #ifndef ARRAY
 #ifndef HEADER
 #define HEADER
diff --git a/test/OpenMP/taskloop_simd_lastprivate_codegen.cpp b/test/OpenMP/taskloop_simd_lastprivate_codegen.cpp
index 856285d7c2..e3562a8f0c 100644
--- a/test/OpenMP/taskloop_simd_lastprivate_codegen.cpp
+++ b/test/OpenMP/taskloop_simd_lastprivate_codegen.cpp
@@ -6,8 +6,8 @@
 // RUN: %clang_cc1 -verify -fopenmp -x c++ -std=c++11 -DARRAY -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck -check-prefix=ARRAY %s
 // expected-no-diagnostics
 // REQUIRES: x86-registered-target
-// XFAIL: win32
-
+// It doesn't pass on win32.
+// REQUIRES: shell
 #ifndef ARRAY
 #ifndef HEADER
 #define HEADER
diff --git a/test/OpenMP/taskloop_simd_private_codegen.cpp b/test/OpenMP/taskloop_simd_private_codegen.cpp
index 985a2b5828..557601e9c9 100644
--- a/test/OpenMP/taskloop_simd_private_codegen.cpp
+++ b/test/OpenMP/taskloop_simd_private_codegen.cpp
@@ -7,7 +7,7 @@
 // expected-no-diagnostics
 // REQUIRES: x86-registered-target
 // It doesn't pass on win32. Investigating.
-// XFAIL: win32
+// REQUIRES: shell
 
 #ifndef ARRAY
 #ifndef HEADER