rogfer01 created this revision. rogfer01 added reviewers: lewis-revill, asb, simoncook, kristina. Herald added subscribers: jocewei, PkmX, rkruppe, the_o, brucehoult, MartinMosbeck, mgrang, edward-jones, zzheng, shiva0217, kito-cheng, niosHD, sabuasal, apazos, johnrusso, rbar.
In https://reviews.llvm.org/rL341655 we added additional behaviour to the Driver for riscv32-unknown-elf when the sysroot is empty. The new tests that check the new behaviour expect that the absence of `--sysroot` in the command-line implies that the sysroot empty. This doesn't hold if clang is built with a non-empty `DEFAULT_SYSROOT` in cmake. When this is the case, this test fails. Since the new behaviour is triggered when the sysroot is empty, pass an empty `--sysroot` to avoid using the default (if any). https://reviews.llvm.org/D51972 Files: test/Driver/riscv32-toolchain.c Index: test/Driver/riscv32-toolchain.c =================================================================== --- test/Driver/riscv32-toolchain.c +++ test/Driver/riscv32-toolchain.c @@ -21,6 +21,7 @@ // RUN: %clang %s -### -no-canonical-prefixes \ // RUN: -target riscv32-unknown-elf \ +// RUN: --sysroot= \ // RUN: --gcc-toolchain=%S/Inputs/basic_riscv32_tree 2>&1 \ // RUN: | FileCheck -check-prefix=C-RV32-BAREMETAL-NOSYSROOT-ILP32 %s @@ -52,6 +53,7 @@ // RUN: %clangxx %s -### -no-canonical-prefixes \ // RUN: -target riscv32-unknown-elf -stdlib=libstdc++ \ +// RUN: --sysroot= \ // RUN: --gcc-toolchain=%S/Inputs/basic_riscv32_tree 2>&1 \ // RUN: | FileCheck -check-prefix=CXX-RV32-BAREMETAL-NOSYSROOT-ILP32 %s
Index: test/Driver/riscv32-toolchain.c =================================================================== --- test/Driver/riscv32-toolchain.c +++ test/Driver/riscv32-toolchain.c @@ -21,6 +21,7 @@ // RUN: %clang %s -### -no-canonical-prefixes \ // RUN: -target riscv32-unknown-elf \ +// RUN: --sysroot= \ // RUN: --gcc-toolchain=%S/Inputs/basic_riscv32_tree 2>&1 \ // RUN: | FileCheck -check-prefix=C-RV32-BAREMETAL-NOSYSROOT-ILP32 %s @@ -52,6 +53,7 @@ // RUN: %clangxx %s -### -no-canonical-prefixes \ // RUN: -target riscv32-unknown-elf -stdlib=libstdc++ \ +// RUN: --sysroot= \ // RUN: --gcc-toolchain=%S/Inputs/basic_riscv32_tree 2>&1 \ // RUN: | FileCheck -check-prefix=CXX-RV32-BAREMETAL-NOSYSROOT-ILP32 %s
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
