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

diff --git a/test/Driver/rewrite-map-in-diagnostics.c b/test/Driver/rewrite-map-in-diagnostics.c
index 7c5811539ef140a382cf05aa3c353cd3cb9221b1..4aea0ec031456bdb8de3f32898dd9a77c864e119 100644 (file)
--- 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 b17729312a22782431ac6f359fbdaa510435b061..0d8e1c4afe4e5ff24abc05e63a614b4ee09c5aa5 100644 (file)
--- 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 2e2ae844d2f06a590f56b4858992820f45f80f14..97155a73f1bd0c5495c82d1ccccd50d1c3eeb83a 100644 (file)
--- 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 d6886e391332138d34be2fed1304cb658d5e4117..822a5c687dc76af23a0cef11e6178b34f4824fe7 100644 (file)
--- 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 c8293ebae876475cbfd01286a843710c86955b3f..8414b6f963f9819ba6667c0973e5c01404f7b4d2 100644 (file)
--- 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 630a5c120250c077da0dec041cea8f8e3476aee8..38b20c579393bf215a7f419dfa6816b4dad6e928 100644 (file)
--- 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 01a4f28e5b7bfb68894a867cc659eafa8d5a97e9..0b87ddd9acb1220244e95d013465efb4670328f9 100644 (file)
--- 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 856285d7c21c3adc26a2681fe6c521e2d53d301e..e3562a8f0c62d8f4da4d0127eefe400c8b006f9e 100644 (file)
--- 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 985a2b5828708e8b2d629e0340bc5e9843d02958..557601e9c93e4013843e3523b188df13d76bd349 100644 (file)
--- 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