StephenFan created this revision. StephenFan added reviewers: MaskRay, khchen, asb, jrtc27. Herald added subscribers: s, VincentWu, luke957, vkmr, frasercrmck, evandro, luismarques, apazos, sameer.abuasal, s.egerton, Jim, benna, psnobl, jocewei, PkmX, the_o, brucehoult, MartinMosbeck, rogfer01, edward-jones, zzheng, kito-cheng, niosHD, sabuasal, simoncook, johnrusso, rbar, arichardson. Herald added a project: All. StephenFan requested review of this revision. Herald added subscribers: cfe-commits, pcwang-thead, eopXD. Herald added a project: clang.
Due to D79842 <https://reviews.llvm.org/D79842>, clang dirver would search possible tool name in both possible locations, then moving to the next name. The gcc toolchain `llvm-project/clang/test/Driver/ Inputs/multilib_riscv_elf_sdk` don't have a `riscv64-unknown-elf-ld` executable in `llvm-project/clang/test/Driver/Inputs/multilib_riscv_elf_sdk/bin/`. So when searching `riscv64-unknown-elf-ld`, if there is a `riscv64-unknown-elf-ld` in `PATH`, the test would fail. This patch makes the `PATH` empty when testing it. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D122588 Files: clang/test/Driver/riscv64-toolchain.c Index: clang/test/Driver/riscv64-toolchain.c =================================================================== --- clang/test/Driver/riscv64-toolchain.c +++ clang/test/Driver/riscv64-toolchain.c @@ -104,7 +104,7 @@ // C-RV64-LINUX-MULTI-LP64D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib64/lp64d" // C-RV64-LINUX-MULTI-LP64D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib64/lp64d" -// RUN: %clang %s -### -fuse-ld=ld \ +// RUN: env "PATH=" %clang %s -### -fuse-ld=ld \ // RUN: --target=riscv64-unknown-elf --rtlib=platform --sysroot= \ // RUN: -march=rv64imac -mabi=lp64\ // RUN: --gcc-toolchain=%S/Inputs/multilib_riscv_elf_sdk 2>&1 \ @@ -119,7 +119,7 @@ // C-RV64IMAC-BAREMETAL-MULTI-LP64: "--start-group" "-lc" "-lgloss" "--end-group" "-lgcc" // C-RV64IMAC-BAREMETAL-MULTI-LP64: "{{.*}}/Inputs/multilib_riscv_elf_sdk/lib/gcc/riscv64-unknown-elf/8.2.0/rv64imac/lp64{{/|\\\\}}crtend.o" -// RUN: %clang %s -### -fuse-ld=ld \ +// RUN: env "PATH=" %clang %s -### -fuse-ld=ld \ // RUN: --target=riscv64-unknown-elf --rtlib=platform --sysroot= \ // RUN: -march=rv64imafdc -mabi=lp64d \ // RUN: --gcc-toolchain=%S/Inputs/multilib_riscv_elf_sdk 2>&1 \
Index: clang/test/Driver/riscv64-toolchain.c =================================================================== --- clang/test/Driver/riscv64-toolchain.c +++ clang/test/Driver/riscv64-toolchain.c @@ -104,7 +104,7 @@ // C-RV64-LINUX-MULTI-LP64D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib64/lp64d" // C-RV64-LINUX-MULTI-LP64D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib64/lp64d" -// RUN: %clang %s -### -fuse-ld=ld \ +// RUN: env "PATH=" %clang %s -### -fuse-ld=ld \ // RUN: --target=riscv64-unknown-elf --rtlib=platform --sysroot= \ // RUN: -march=rv64imac -mabi=lp64\ // RUN: --gcc-toolchain=%S/Inputs/multilib_riscv_elf_sdk 2>&1 \ @@ -119,7 +119,7 @@ // C-RV64IMAC-BAREMETAL-MULTI-LP64: "--start-group" "-lc" "-lgloss" "--end-group" "-lgcc" // C-RV64IMAC-BAREMETAL-MULTI-LP64: "{{.*}}/Inputs/multilib_riscv_elf_sdk/lib/gcc/riscv64-unknown-elf/8.2.0/rv64imac/lp64{{/|\\\\}}crtend.o" -// RUN: %clang %s -### -fuse-ld=ld \ +// RUN: env "PATH=" %clang %s -### -fuse-ld=ld \ // RUN: --target=riscv64-unknown-elf --rtlib=platform --sysroot= \ // RUN: -march=rv64imafdc -mabi=lp64d \ // RUN: --gcc-toolchain=%S/Inputs/multilib_riscv_elf_sdk 2>&1 \
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits