[clang] [CLANG][NFC] Modify test cases to suit assigned default sysroot path (PR #77075)
https://github.com/Yunzezhu94 updated https://github.com/llvm/llvm-project/pull/77075 >From e04fa94a98b71e729885b0544add053127180f7d Mon Sep 17 00:00:00 2001 From: Yunze Zhu Date: Fri, 5 Jan 2024 17:11:26 +0800 Subject: [PATCH] [CLANG][NFC] Modify test cases to suit assigned default sysroot path When using cmake with option -DDEFAULT_SYSROOT, a default sysroot path is assigned. However, some test cases use a relative path to indicate sysroot path, but the path goes wrong with default sysroot path assigned. This patch modified test cases to make them use correct sysroot path. --- clang/test/Driver/baremetal.cpp | 10 +- clang/test/Driver/csky-toolchain.c | 4 ++-- clang/test/Driver/freebsd-include-paths.c | 4 ++-- clang/test/Driver/haiku.c | 2 +- clang/test/Driver/hexagon-toolchain-linux.c | 2 ++ clang/test/Driver/riscv32-toolchain-extra.c | 1 + clang/test/Driver/riscv64-toolchain-extra.c | 1 + clang/test/Driver/solaris-ld.c | 2 +- 8 files changed, 15 insertions(+), 11 deletions(-) diff --git a/clang/test/Driver/baremetal.cpp b/clang/test/Driver/baremetal.cpp index c04f4506a0994..03d0fbcc76fd1 100644 --- a/clang/test/Driver/baremetal.cpp +++ b/clang/test/Driver/baremetal.cpp @@ -157,7 +157,7 @@ // RUN: %clang -### %s --target=aarch64_be-none-elf -mlittle-endian --sysroot=%S/Inputs/baremetal_arm 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-AARCH64LE %s -// RUN: %clang -no-canonical-prefixes %s -### --target=aarch64-none-elf 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=aarch64-none-elf 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-AARCH64-NO-HOST-INC %s // Verify that the bare metal driver does not include any host system paths: // CHECK-AARCH64-NO-HOST-INC: InstalledDir: [[INSTALLEDDIR:.+]] @@ -385,7 +385,7 @@ // CHECK-RV32IMAFC-SAME: "-L[[SYSROOT:[^"]+]]{{[/\\]+}}rv32imafc{{[/\\]+}}ilp32f{{[/\\]+}}lib" // CHECK-RV32IMAFC-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal{{[/\\]+}}rv32imafc{{[/\\]+}}ilp32f" -// RUN: %clang -no-canonical-prefixes %s -### --target=powerpc-unknown-eabi 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=powerpc-unknown-eabi 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PPCEABI %s // CHECK-PPCEABI: InstalledDir: [[INSTALLEDDIR:.+]] // CHECK-PPCEABI: "-nostdsysteminc" @@ -398,7 +398,7 @@ // CHECK-PPCEABI-SAME: "-L[[RESOURCE]]{{[/\\]+}}lib{{[/\\]+}}baremetal" // CHECK-PPCEABI-SAME: "-lc" "-lm" "-lclang_rt.builtins-powerpc" "-o" "a.out" -// RUN: %clang -no-canonical-prefixes %s -### --target=powerpc64-unknown-eabi 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=powerpc64-unknown-eabi 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PPC64EABI %s // CHECK-PPC64EABI: InstalledDir: [[INSTALLEDDIR:.+]] // CHECK-PPC64EABI: "-nostdsysteminc" @@ -411,7 +411,7 @@ // CHECK-PPC64EABI-SAME: "-L[[RESOURCE]]{{[/\\]+}}lib{{[/\\]+}}baremetal" // CHECK-PPC64EABI-SAME: "-lc" "-lm" "-lclang_rt.builtins-powerpc64" "-o" "a.out" -// RUN: %clang -no-canonical-prefixes %s -### --target=powerpcle-unknown-eabi 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=powerpcle-unknown-eabi 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PPCLEEABI %s // CHECK-PPCLEEABI: InstalledDir: [[INSTALLEDDIR:.+]] // CHECK-PPCLEEABI: "-nostdsysteminc" @@ -424,7 +424,7 @@ // CHECK-PPCLEEABI-SAME: "-L[[RESOURCE]]{{[/\\]+}}lib{{[/\\]+}}baremetal" // CHECK-PPCLEEABI-SAME: "-lc" "-lm" "-lclang_rt.builtins-powerpcle" "-o" "a.out" -// RUN: %clang -no-canonical-prefixes %s -### --target=powerpc64le-unknown-eabi 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=powerpc64le-unknown-eabi 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PPC64LEEABI %s // CHECK-PPC64LEEABI: InstalledDir: [[INSTALLEDDIR:.+]] // CHECK-PPC64LEEABI: "-nostdsysteminc" diff --git a/clang/test/Driver/csky-toolchain.c b/clang/test/Driver/csky-toolchain.c index 66485464652ac..557feeeb1d1d3 100644 --- a/clang/test/Driver/csky-toolchain.c +++ b/clang/test/Driver/csky-toolchain.c @@ -7,7 +7,7 @@ // In the below tests, --rtlib=platform is used so that the driver ignores // the configure-time CLANG_DEFAULT_RTLIB option when choosing the runtime lib -// RUN: %clang -### %s -fuse-ld=ld -no-pie --target=csky-unknown-linux-gnu --rtlib=platform --unwindlib=platform \ +// RUN: %clang -### %s -fuse-ld=ld -no-pie --target=csky-unknown-linux-gnu --rtlib=platform --sysroot="" --unwindlib=platform \ // RUN: --gcc-toolchain=%S/Inputs/multilib_csky_linux_sdk 2>&1 | FileCheck -check-prefix=C-CSKY-LINUX-MULTI %s // C-CSKY-LINUX-MULTI: "{{.*}}/Inputs/multilib_csky_linux_sdk/lib/gcc/csky-linux-gnuabiv2/6.3.0/../../..{{/|}}..{{/|}}csky-linux-gnuabiv2/bin{{/|}}ld" @@ -23,7 +23,7 @@ // C-CSKY-LINUX-MULTI: "-L{{.*}}/Inputs/multilib_csky_linux_sdk/lib/gcc/csky-linux-gnu
[clang] [CLANG][NFC] Modify test cases to suit assigned default sysroot path (PR #77075)
Yunzezhu94 wrote: Gentle Ping. https://github.com/llvm/llvm-project/pull/77075 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [CLANG][NFC] Modify test cases to suit assigned default sysroot path (PR #77075)
Yunzezhu94 wrote: Gentle Ping. https://github.com/llvm/llvm-project/pull/77075 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [CLANG][NFC] Modify test cases to suit assigned default sysroot path (PR #77075)
Yunzezhu94 wrote: > > @MaskRay Wasn't it you that mentioned this? > > Yes. I hoped that we could deprecated `DEFAULT_SYSROOT`: > https://reviews.llvm.org/D158218 , but the relative `DEFAULT_SYSROOT` does > not have a good replacement. I think since relative DEFAULT_SYSROOT still works, modify these cases is helpful to cross compile developers. And this commit could be delete when DEFAULT_SYSROOT get deprecated. https://github.com/llvm/llvm-project/pull/77075 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [CLANG][NFC] Modify test cases to suit assigned default sysroot path (PR #77075)
MaskRay wrote: > @MaskRay Wasn't it you that mentioned this? Yes. I hoped that we could deprecated `DEFAULT_SYSROOT`: https://reviews.llvm.org/D158218 , but the relative `DEFAULT_SYSROOT` does not have a good replacement. https://github.com/llvm/llvm-project/pull/77075 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [CLANG][NFC] Modify test cases to suit assigned default sysroot path (PR #77075)
Yunzezhu94 wrote: Gentle Ping. https://github.com/llvm/llvm-project/pull/77075 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [CLANG][NFC] Modify test cases to suit assigned default sysroot path (PR #77075)
brad0 wrote: @MaskRay Wasn't it you that mentioned this? https://github.com/llvm/llvm-project/pull/77075 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [CLANG][NFC] Modify test cases to suit assigned default sysroot path (PR #77075)
llvmbot wrote: @llvm/pr-subscribers-clang @llvm/pr-subscribers-backend-risc-v Author: None (Yunzezhu94) Changes When using cmake with option -DDEFAULT_SYSROOT, a default sysroot path is assigned. However, some test cases use a relative path to indicate sysroot path, but the path goes wrong with default sysroot path assigned. This patch modified test cases to make them use correct sysroot path. --- Full diff: https://github.com/llvm/llvm-project/pull/77075.diff 8 Files Affected: - (modified) clang/test/Driver/baremetal.cpp (+5-5) - (modified) clang/test/Driver/csky-toolchain.c (+2-2) - (modified) clang/test/Driver/freebsd-include-paths.c (+2-2) - (modified) clang/test/Driver/haiku.c (+1-1) - (modified) clang/test/Driver/hexagon-toolchain-linux.c (+2) - (modified) clang/test/Driver/riscv32-toolchain-extra.c (+1) - (modified) clang/test/Driver/riscv64-toolchain-extra.c (+1) - (modified) clang/test/Driver/solaris-ld.c (+1-1) ``diff diff --git a/clang/test/Driver/baremetal.cpp b/clang/test/Driver/baremetal.cpp index c04f4506a0994d..03d0fbcc76fd1c 100644 --- a/clang/test/Driver/baremetal.cpp +++ b/clang/test/Driver/baremetal.cpp @@ -157,7 +157,7 @@ // RUN: %clang -### %s --target=aarch64_be-none-elf -mlittle-endian --sysroot=%S/Inputs/baremetal_arm 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-AARCH64LE %s -// RUN: %clang -no-canonical-prefixes %s -### --target=aarch64-none-elf 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=aarch64-none-elf 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-AARCH64-NO-HOST-INC %s // Verify that the bare metal driver does not include any host system paths: // CHECK-AARCH64-NO-HOST-INC: InstalledDir: [[INSTALLEDDIR:.+]] @@ -385,7 +385,7 @@ // CHECK-RV32IMAFC-SAME: "-L[[SYSROOT:[^"]+]]{{[/\\]+}}rv32imafc{{[/\\]+}}ilp32f{{[/\\]+}}lib" // CHECK-RV32IMAFC-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal{{[/\\]+}}rv32imafc{{[/\\]+}}ilp32f" -// RUN: %clang -no-canonical-prefixes %s -### --target=powerpc-unknown-eabi 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=powerpc-unknown-eabi 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PPCEABI %s // CHECK-PPCEABI: InstalledDir: [[INSTALLEDDIR:.+]] // CHECK-PPCEABI: "-nostdsysteminc" @@ -398,7 +398,7 @@ // CHECK-PPCEABI-SAME: "-L[[RESOURCE]]{{[/\\]+}}lib{{[/\\]+}}baremetal" // CHECK-PPCEABI-SAME: "-lc" "-lm" "-lclang_rt.builtins-powerpc" "-o" "a.out" -// RUN: %clang -no-canonical-prefixes %s -### --target=powerpc64-unknown-eabi 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=powerpc64-unknown-eabi 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PPC64EABI %s // CHECK-PPC64EABI: InstalledDir: [[INSTALLEDDIR:.+]] // CHECK-PPC64EABI: "-nostdsysteminc" @@ -411,7 +411,7 @@ // CHECK-PPC64EABI-SAME: "-L[[RESOURCE]]{{[/\\]+}}lib{{[/\\]+}}baremetal" // CHECK-PPC64EABI-SAME: "-lc" "-lm" "-lclang_rt.builtins-powerpc64" "-o" "a.out" -// RUN: %clang -no-canonical-prefixes %s -### --target=powerpcle-unknown-eabi 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=powerpcle-unknown-eabi 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PPCLEEABI %s // CHECK-PPCLEEABI: InstalledDir: [[INSTALLEDDIR:.+]] // CHECK-PPCLEEABI: "-nostdsysteminc" @@ -424,7 +424,7 @@ // CHECK-PPCLEEABI-SAME: "-L[[RESOURCE]]{{[/\\]+}}lib{{[/\\]+}}baremetal" // CHECK-PPCLEEABI-SAME: "-lc" "-lm" "-lclang_rt.builtins-powerpcle" "-o" "a.out" -// RUN: %clang -no-canonical-prefixes %s -### --target=powerpc64le-unknown-eabi 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=powerpc64le-unknown-eabi 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PPC64LEEABI %s // CHECK-PPC64LEEABI: InstalledDir: [[INSTALLEDDIR:.+]] // CHECK-PPC64LEEABI: "-nostdsysteminc" diff --git a/clang/test/Driver/csky-toolchain.c b/clang/test/Driver/csky-toolchain.c index 66485464652ac8..557feeeb1d1d38 100644 --- a/clang/test/Driver/csky-toolchain.c +++ b/clang/test/Driver/csky-toolchain.c @@ -7,7 +7,7 @@ // In the below tests, --rtlib=platform is used so that the driver ignores // the configure-time CLANG_DEFAULT_RTLIB option when choosing the runtime lib -// RUN: %clang -### %s -fuse-ld=ld -no-pie --target=csky-unknown-linux-gnu --rtlib=platform --unwindlib=platform \ +// RUN: %clang -### %s -fuse-ld=ld -no-pie --target=csky-unknown-linux-gnu --rtlib=platform --sysroot="" --unwindlib=platform \ // RUN: --gcc-toolchain=%S/Inputs/multilib_csky_linux_sdk 2>&1 | FileCheck -check-prefix=C-CSKY-LINUX-MULTI %s // C-CSKY-LINUX-MULTI: "{{.*}}/Inputs/multilib_csky_linux_sdk/lib/gcc/csky-linux-gnuabiv2/6.3.0/../../..{{/|}}..{{/|}}csky-linux-gnuabiv2/bin{{/|}}ld" @@ -23,7 +23,7 @@ // C-CSKY-LINUX-MULTI: "-L{{.*}}/Inputs/multilib_csky_linux_sdk/lib/gcc/csky-linux-gnuabiv2/6.3.0/../../..{{/|}}..{{/|}}csky-linux-gnuabiv2/libc/lib" // C-CSKY-LINUX-MULTI: "-
[clang] [CLANG][NFC] Modify test cases to suit assigned default sysroot path (PR #77075)
https://github.com/Yunzezhu94 created https://github.com/llvm/llvm-project/pull/77075 When using cmake with option -DDEFAULT_SYSROOT, a default sysroot path is assigned. However, some test cases use a relative path to indicate sysroot path, but the path goes wrong with default sysroot path assigned. This patch modified test cases to make them use correct sysroot path. >From e04fa94a98b71e729885b0544add053127180f7d Mon Sep 17 00:00:00 2001 From: Yunze Zhu Date: Fri, 5 Jan 2024 17:11:26 +0800 Subject: [PATCH] [CLANG][NFC] Modify test cases to suit assigned default sysroot path When using cmake with option -DDEFAULT_SYSROOT, a default sysroot path is assigned. However, some test cases use a relative path to indicate sysroot path, but the path goes wrong with default sysroot path assigned. This patch modified test cases to make them use correct sysroot path. --- clang/test/Driver/baremetal.cpp | 10 +- clang/test/Driver/csky-toolchain.c | 4 ++-- clang/test/Driver/freebsd-include-paths.c | 4 ++-- clang/test/Driver/haiku.c | 2 +- clang/test/Driver/hexagon-toolchain-linux.c | 2 ++ clang/test/Driver/riscv32-toolchain-extra.c | 1 + clang/test/Driver/riscv64-toolchain-extra.c | 1 + clang/test/Driver/solaris-ld.c | 2 +- 8 files changed, 15 insertions(+), 11 deletions(-) diff --git a/clang/test/Driver/baremetal.cpp b/clang/test/Driver/baremetal.cpp index c04f4506a0994d..03d0fbcc76fd1c 100644 --- a/clang/test/Driver/baremetal.cpp +++ b/clang/test/Driver/baremetal.cpp @@ -157,7 +157,7 @@ // RUN: %clang -### %s --target=aarch64_be-none-elf -mlittle-endian --sysroot=%S/Inputs/baremetal_arm 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-AARCH64LE %s -// RUN: %clang -no-canonical-prefixes %s -### --target=aarch64-none-elf 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=aarch64-none-elf 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-AARCH64-NO-HOST-INC %s // Verify that the bare metal driver does not include any host system paths: // CHECK-AARCH64-NO-HOST-INC: InstalledDir: [[INSTALLEDDIR:.+]] @@ -385,7 +385,7 @@ // CHECK-RV32IMAFC-SAME: "-L[[SYSROOT:[^"]+]]{{[/\\]+}}rv32imafc{{[/\\]+}}ilp32f{{[/\\]+}}lib" // CHECK-RV32IMAFC-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal{{[/\\]+}}rv32imafc{{[/\\]+}}ilp32f" -// RUN: %clang -no-canonical-prefixes %s -### --target=powerpc-unknown-eabi 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=powerpc-unknown-eabi 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PPCEABI %s // CHECK-PPCEABI: InstalledDir: [[INSTALLEDDIR:.+]] // CHECK-PPCEABI: "-nostdsysteminc" @@ -398,7 +398,7 @@ // CHECK-PPCEABI-SAME: "-L[[RESOURCE]]{{[/\\]+}}lib{{[/\\]+}}baremetal" // CHECK-PPCEABI-SAME: "-lc" "-lm" "-lclang_rt.builtins-powerpc" "-o" "a.out" -// RUN: %clang -no-canonical-prefixes %s -### --target=powerpc64-unknown-eabi 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=powerpc64-unknown-eabi 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PPC64EABI %s // CHECK-PPC64EABI: InstalledDir: [[INSTALLEDDIR:.+]] // CHECK-PPC64EABI: "-nostdsysteminc" @@ -411,7 +411,7 @@ // CHECK-PPC64EABI-SAME: "-L[[RESOURCE]]{{[/\\]+}}lib{{[/\\]+}}baremetal" // CHECK-PPC64EABI-SAME: "-lc" "-lm" "-lclang_rt.builtins-powerpc64" "-o" "a.out" -// RUN: %clang -no-canonical-prefixes %s -### --target=powerpcle-unknown-eabi 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=powerpcle-unknown-eabi 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PPCLEEABI %s // CHECK-PPCLEEABI: InstalledDir: [[INSTALLEDDIR:.+]] // CHECK-PPCLEEABI: "-nostdsysteminc" @@ -424,7 +424,7 @@ // CHECK-PPCLEEABI-SAME: "-L[[RESOURCE]]{{[/\\]+}}lib{{[/\\]+}}baremetal" // CHECK-PPCLEEABI-SAME: "-lc" "-lm" "-lclang_rt.builtins-powerpcle" "-o" "a.out" -// RUN: %clang -no-canonical-prefixes %s -### --target=powerpc64le-unknown-eabi 2>&1 \ +// RUN: %clang -no-canonical-prefixes %s -### --sysroot="" --target=powerpc64le-unknown-eabi 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-PPC64LEEABI %s // CHECK-PPC64LEEABI: InstalledDir: [[INSTALLEDDIR:.+]] // CHECK-PPC64LEEABI: "-nostdsysteminc" diff --git a/clang/test/Driver/csky-toolchain.c b/clang/test/Driver/csky-toolchain.c index 66485464652ac8..557feeeb1d1d38 100644 --- a/clang/test/Driver/csky-toolchain.c +++ b/clang/test/Driver/csky-toolchain.c @@ -7,7 +7,7 @@ // In the below tests, --rtlib=platform is used so that the driver ignores // the configure-time CLANG_DEFAULT_RTLIB option when choosing the runtime lib -// RUN: %clang -### %s -fuse-ld=ld -no-pie --target=csky-unknown-linux-gnu --rtlib=platform --unwindlib=platform \ +// RUN: %clang -### %s -fuse-ld=ld -no-pie --target=csky-unknown-linux-gnu --rtlib=platform --sysroot="" --unwindlib=platform \ // RUN: --gcc-toolchain=%S/Inputs/multilib_csky_linux_sdk 2>&1 | FileCheck -check-prefix=C