Skip to content

Commit

Permalink
Since r179283, internal shell is default on windows and so shell-pres…
Browse files Browse the repository at this point in the history
…erves-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
  • Loading branch information
yrnkrn committed Jul 15, 2015
1 parent 24e64f9 commit a42afdd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion test/Driver/darwin-sdkroot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/Driver/dyld-prefix.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// REQUIRES: shell-preserves-root
// REQUIRES: shell

// RUN: touch %t.o

Expand Down

0 comments on commit a42afdd

Please sign in to comment.