From 38e033bf33e8a8261d1d4497524fe75ef3486a9a Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Tue, 10 Sep 2019 20:15:45 +0000
Subject: Re-land Remove REQUIRES:shell from tests that pass for me on Windows

This reverts r371497 (git commit 3d7e9ab7b9f8c53aa41420c54970f0fb421004a2)

Reorder `not` with `env` in these two tests so they pass:
  Driver/rewrite-map-in-diagnostics.c
  Index/crash-recovery-modules.m.

This will not be necessary after D66531 lands.

llvm-svn: 371552
---
 clang/test/Modules/at-import-in-framework-header.m    | 2 --
 clang/test/Modules/builtins.m                         | 1 -
 clang/test/Modules/dependency-dump-dependent-module.m | 2 --
 clang/test/Modules/dependency-dump.m                  | 2 --
 clang/test/Modules/implicit-invalidate-common.c       | 1 -
 5 files changed, 8 deletions(-)

(limited to 'clang/test/Modules')

diff --git a/clang/test/Modules/at-import-in-framework-header.m b/clang/test/Modules/at-import-in-framework-header.m
index fe366381207..043c69462ed 100644
--- a/clang/test/Modules/at-import-in-framework-header.m
+++ b/clang/test/Modules/at-import-in-framework-header.m
@@ -1,5 +1,3 @@
-// REQUIRES: shell
-
 // RUN: rm -rf %t
 // RUN: mkdir %t
 
diff --git a/clang/test/Modules/builtins.m b/clang/test/Modules/builtins.m
index 88a44e7b0aa..2480e6379cc 100644
--- a/clang/test/Modules/builtins.m
+++ b/clang/test/Modules/builtins.m
@@ -8,7 +8,6 @@
 // RUN: %clang_cc1 -fmodules-cache-path=%t.pch.cache -fmodules -fimplicit-module-maps -I %S/Inputs %s -include-pch %t.pch %s -verify
 
 // expected-no-diagnostics
-// REQUIRES: shell
 
 void use_constant_string_builtins1(void) {
   (void)__builtin___CFStringMakeConstantString("");
diff --git a/clang/test/Modules/dependency-dump-dependent-module.m b/clang/test/Modules/dependency-dump-dependent-module.m
index 49069861654..2430726d3ae 100644
--- a/clang/test/Modules/dependency-dump-dependent-module.m
+++ b/clang/test/Modules/dependency-dump-dependent-module.m
@@ -1,8 +1,6 @@
 // When a module depends on another, check that we dump the dependency header
 // files for both.
 
-// REQUIRES: shell
-
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -module-dependency-dir %t/vfs -F %S/Inputs -I %S/Inputs -verify %s
 // expected-no-diagnostics
diff --git a/clang/test/Modules/dependency-dump.m b/clang/test/Modules/dependency-dump.m
index deb66188e14..f3a487544b8 100644
--- a/clang/test/Modules/dependency-dump.m
+++ b/clang/test/Modules/dependency-dump.m
@@ -1,8 +1,6 @@
 // Check that we can dump all of the headers a module depends on, and a VFS map
 // for the same.
 
-// REQUIRES: shell
-
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -module-dependency-dir %t/vfs -F %S/Inputs -I %S/Inputs -verify %s
 // expected-no-diagnostics
diff --git a/clang/test/Modules/implicit-invalidate-common.c b/clang/test/Modules/implicit-invalidate-common.c
index d6cf90e12dc..143a00ff37a 100644
--- a/clang/test/Modules/implicit-invalidate-common.c
+++ b/clang/test/Modules/implicit-invalidate-common.c
@@ -1,4 +1,3 @@
-// REQUIRES: shell
 // RUN: rm -rf %t
 // RUN: mkdir -p %t/implicit-invalidate-common
 // RUN: cp -r %S/Inputs/implicit-invalidate-common %t/
-- 
cgit v1.2.3