Since r179283, internal shell is default on windows and so shell-preserves-root

is true on MSYS bash although this requires: used to disable tests on MSYS bash.

Nevertheless, all tests requiring shell-preserves-root do pass except for
Driver/darwin-sdkroot.c. It will require a patch, either by disabling it on 
Windows or by fixing shell-preserves-root to really be true only on MSYS
and making darwin-sdkroot.c its only user.

In any case, all other tests requiring shell-preserves-root do not really require
it so I'm replacing REQUIRES: shell-preserves-root with REQUIRES: shell in two
tests first.

llvm-svn: 242312

2 files changed, 2 insertions, 2 deletions

diff --git a/clang/test/Driver/darwin-sdkroot.c b/clang/test/Driver/darwin-sdkroot.c
index 3fc2a13c19c..b1d794e193c 100644
--- a/clang/test/Driver/darwin-sdkroot.c
+++ b/clang/test/Driver/darwin-sdkroot.c
@@ -32,7 +32,7 @@
 // CHECK-NONROOT-NOT: "-isysroot"
 //
 // It doesn't make sense on msys bash.
-// REQUIRES: shell-preserves-root
+// REQUIRES: shell
 //
 // This test fails with MSYS or MSYS2 env.exe, since it does not preserve
 // root, expanding / into C:/MINGW/MSYS/1.0 or c:/msys64. To reproduce the
diff --git a/clang/test/Driver/dyld-prefix.c b/clang/test/Driver/dyld-prefix.c
index 5336a1142ea..54e063cb834 100644
--- a/clang/test/Driver/dyld-prefix.c
+++ b/clang/test/Driver/dyld-prefix.c
@@ -1,4 +1,4 @@
-// REQUIRES: shell-preserves-root
+// REQUIRES: shell
 
 // RUN: touch %t.o