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.

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

diff --git a/test/Driver/darwin-sdkroot.c b/test/Driver/darwin-sdkroot.c
index 3fc2a13c19cddd1bf211a77fa1eb6b1d7de17987..b1d794e193c3d67f8ec84532620f6cc78b373665 100644 (file)
--- a/test/Driver/darwin-sdkroot.c
+++ b/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/test/Driver/dyld-prefix.c b/test/Driver/dyld-prefix.c
index 5336a1142ea9faf8836c806386375c2a2a5a124b..54e063cb834936039c6f28f1b875afab138cc252 100644 (file)
--- a/test/Driver/dyld-prefix.c
+++ b/test/Driver/dyld-prefix.c
@@ -1,4 +1,4 @@
-// REQUIRES: shell-preserves-root
+// REQUIRES: shell
 
 // RUN: touch %t.o