carlocab created this revision.
carlocab added a reviewer: abidh.
carlocab added a project: clang.
Herald added a subscriber: ki.stfu.
carlocab requested review of this revision.
Herald added a subscriber: cfe-commits.
The `baremetal-sysroot` test fails when the toolchain is configured with
`DEFAULT_SYSROOT`. So, to emulate not having passed one at all, let's
pass an empty sysroot instead.
This simply follows D79694 <https://reviews.llvm.org/D79694>, D66834
<https://reviews.llvm.org/D66834>, and D51972
<https://reviews.llvm.org/D51972>. D51972 <https://reviews.llvm.org/D51972> in
particular was
meant to address a failing test for behaviour when `--sysroot` is not
passed and `DEFAULT_SYSROOT` is set.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D119144
Files:
clang/test/Driver/baremetal-sysroot.cpp
Index: clang/test/Driver/baremetal-sysroot.cpp
===================================================================
--- clang/test/Driver/baremetal-sysroot.cpp
+++ clang/test/Driver/baremetal-sysroot.cpp
@@ -10,7 +10,7 @@
// RUN: ln -s %clang %T/baremetal_default_sysroot/bin/clang
// RUN: %T/baremetal_default_sysroot/bin/clang -no-canonical-prefixes %s -###
-o %t.o 2>&1 \
-// RUN: -target armv6m-none-eabi \
+// RUN: -target armv6m-none-eabi --sysroot= \
// RUN: | FileCheck --check-prefix=CHECK-V6M-C %s
// CHECK-V6M-C: "{{.*}}clang{{.*}}" "-cc1" "-triple"
"thumbv6m-none-unknown-eabi"
// CHECK-V6M-C-SAME: "-internal-isystem"
"{{.*}}/baremetal_default_sysroot{{[/\\]+}}bin{{[/\\]+}}..{{[/\\]+}}lib{{[/\\]+}}clang-runtimes{{[/\\]+}}armv6m-none-eabi{{[/\\]+}}include{{[/\\]+}}c++{{[/\\]+}}v1"
Index: clang/test/Driver/baremetal-sysroot.cpp
===================================================================
--- clang/test/Driver/baremetal-sysroot.cpp
+++ clang/test/Driver/baremetal-sysroot.cpp
@@ -10,7 +10,7 @@
// RUN: ln -s %clang %T/baremetal_default_sysroot/bin/clang
// RUN: %T/baremetal_default_sysroot/bin/clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN: -target armv6m-none-eabi \
+// RUN: -target armv6m-none-eabi --sysroot= \
// RUN: | FileCheck --check-prefix=CHECK-V6M-C %s
// CHECK-V6M-C: "{{.*}}clang{{.*}}" "-cc1" "-triple" "thumbv6m-none-unknown-eabi"
// CHECK-V6M-C-SAME: "-internal-isystem" "{{.*}}/baremetal_default_sysroot{{[/\\]+}}bin{{[/\\]+}}..{{[/\\]+}}lib{{[/\\]+}}clang-runtimes{{[/\\]+}}armv6m-none-eabi{{[/\\]+}}include{{[/\\]+}}c++{{[/\\]+}}v1"
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
