[clang] e01ec11 - make ccabe93298 more robust

[Nico Weber via cfe-commits]

Author: Nico Weber
Date: 2020-04-05T13:07:50-04:00
New Revision: e01ec11882d3a2af509ec5caf248ecd79485240c

URL: https://github.com/llvm/llvm-project/commit/e01ec11882d3a2af509ec5caf248ecd79485240c
DIFF: https://github.com/llvm/llvm-project/commit/e01ec11882d3a2af509ec5caf248ecd79485240c.diff

LOG: make ccabe93298 more robust

Added: 
    

Modified: 
    clang/test/Driver/mingw-sysroot.cpp
    clang/test/Driver/riscv32-toolchain-extra.c
    clang/test/Driver/riscv64-toolchain-extra.c

Removed: 
    


################################################################################
diff  --git a/clang/test/Driver/mingw-sysroot.cpp b/clang/test/Driver/mingw-sysroot.cpp
index 9c6ded76127d..eb62b6fe5d0c 100644
--- a/clang/test/Driver/mingw-sysroot.cpp
+++ b/clang/test/Driver/mingw-sysroot.cpp
@@ -1,14 +1,14 @@
 // REQUIRES: shell
 // UNSUPPORTED: system-windows
 
-// RUN: rm -rf %T/testroot-gcc/bin
+// RUN: rm -rf %T/testroot-gcc
 // RUN: mkdir -p %T/testroot-gcc/bin
 // RUN: ln -s %clang %T/testroot-gcc/bin/x86_64-w64-mingw32-gcc
 // RUN: ln -s %clang %T/testroot-gcc/bin/x86_64-w64-mingw32-clang
 // RUN: ln -s %S/Inputs/mingw_ubuntu_posix_tree/usr/x86_64-w64-mingw32 %T/testroot-gcc/x86_64-w64-mingw32
 // RUN: ln -s %S/Inputs/mingw_ubuntu_posix_tree/usr/lib %T/testroot-gcc/lib
 
-// RUN: rm -rf %T/testroot-clang/bin
+// RUN: rm -rf %T/testroot-clang
 // RUN: mkdir -p %T/testroot-clang/bin
 // RUN: ln -s %clang %T/testroot-clang/bin/x86_64-w64-mingw32-clang
 // RUN: ln -s %S/Inputs/mingw_ubuntu_posix_tree/usr/x86_64-w64-mingw32 %T/testroot-clang/x86_64-w64-mingw32

diff  --git a/clang/test/Driver/riscv32-toolchain-extra.c b/clang/test/Driver/riscv32-toolchain-extra.c
index f70092ac0333..8103e55b9aa5 100644
--- a/clang/test/Driver/riscv32-toolchain-extra.c
+++ b/clang/test/Driver/riscv32-toolchain-extra.c
@@ -12,7 +12,7 @@
 // runtime if and only if they exist.
 //
 // REQUIRES: platform-linker
-// RUN: rm -rf %T/testroot-riscv32-baremetal-nogcc/bin
+// RUN: rm -rf %T/testroot-riscv32-baremetal-nogcc
 // RUN: mkdir -p %T/testroot-riscv32-baremetal-nogcc/bin
 // RUN: ln -s %clang %T/testroot-riscv32-baremetal-nogcc/bin/clang
 // RUN: ln -s %S/Inputs/basic_riscv32_nogcc_tree/bin/riscv32-unknown-elf-ld %T/testroot-riscv32-baremetal-nogcc/bin/riscv32-unknown-elf-ld

diff  --git a/clang/test/Driver/riscv64-toolchain-extra.c b/clang/test/Driver/riscv64-toolchain-extra.c
index 434f2dd2599a..d11f92275f4e 100644
--- a/clang/test/Driver/riscv64-toolchain-extra.c
+++ b/clang/test/Driver/riscv64-toolchain-extra.c
@@ -12,7 +12,7 @@
 // runtime if and only if they exist.
 //
 // REQUIRES: platform-linker
-// RUN: rm -rf %T/testroot-riscv64-baremetal-nogcc/bin
+// RUN: rm -rf %T/testroot-riscv64-baremetal-nogcc
 // RUN: mkdir -p %T/testroot-riscv64-baremetal-nogcc/bin
 // RUN: ln -s %clang %T/testroot-riscv64-baremetal-nogcc/bin/clang
 // RUN: ln -s %S/Inputs/basic_riscv64_nogcc_tree/bin/riscv64-unknown-elf-ld %T/testroot-riscv64-baremetal-nogcc/bin/riscv64-unknown-elf-ld