https://github.com/hokein updated
https://github.com/llvm/llvm-project/pull/94349
>From b9bd6c36196c7f1fdf6ec7a56260425e0b7255f7 Mon Sep 17 00:00:00 2001
From: Haojian Wu <hokein...@gmail.com>
Date: Tue, 4 Jun 2024 14:51:10 +0200
Subject: [PATCH] [Driver] Dont use absolute paths for invoking subcommands for
driver tests
We see some tests are failing internally after
12949c952c4fbad776a860c003ccf176973278a0.
In some CAS systems, we might not see the exact binary name (clang),
this patch adds the `-no-canonical-prefixes` option to the command line to not
realpath-ify the binary name.
---
clang/test/Driver/mips-mti-linux.c | 4 ++--
clang/test/Driver/openmp-offload-gpu.c | 6 +++---
clang/test/Driver/openmp-offload.c | 14 +++++++-------
clang/test/Driver/ve-toolchain.c | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/clang/test/Driver/mips-mti-linux.c
b/clang/test/Driver/mips-mti-linux.c
index d10eb837b8a6e..e976269dfadf6 100644
--- a/clang/test/Driver/mips-mti-linux.c
+++ b/clang/test/Driver/mips-mti-linux.c
@@ -6,7 +6,7 @@
// the --gcc-toolchain one.
// = Big-endian, mips32r2, hard float
-// RUN: %clang -### %s 2>&1 \
+// RUN: %clang -### -no-canonical-prefixes %s 2>&1 \
// RUN: --target=mips-mti-linux -mips32r2 -mhard-float -no-pie \
// RUN: -rtlib=platform -fuse-ld=ld \
// RUN: --sysroot=%S/Inputs/mips_mti_linux/sysroot \
@@ -25,7 +25,7 @@
// CHECK-BE-HF-32R2-SAME:
"[[SYSROOT]]/mips-r2-hard-musl/usr/lib{{/|\\\\}}crtn.o"
// = Little-endian, mips32r2, hard float
-// RUN: %clang -### %s 2>&1 \
+// RUN: %clang -### -no-canonical-prefixes %s 2>&1 \
// RUN: --target=mips-mti-linux -mips32r2 -EL -mhard-float -no-pie \
// RUN: -rtlib=platform -fuse-ld=ld \
// RUN: --sysroot=%S/Inputs/mips_mti_linux/sysroot \
diff --git a/clang/test/Driver/openmp-offload-gpu.c
b/clang/test/Driver/openmp-offload-gpu.c
index 0b98aaf6ba53c..7c91bdab35be0 100644
--- a/clang/test/Driver/openmp-offload-gpu.c
+++ b/clang/test/Driver/openmp-offload-gpu.c
@@ -70,21 +70,21 @@
/// Check that the runtime bitcode library is part of the compile line.
/// Create a bogus bitcode library and specify it with
libomptarget-nvptx-bc-path
-// RUN: %clang -### -fopenmp=libomp -fopenmp-targets=nvptx64-nvidia-cuda \
+// RUN: %clang -### -no-canonical-prefixes -fopenmp=libomp
-fopenmp-targets=nvptx64-nvidia-cuda \
// RUN:
--libomptarget-nvptx-bc-path=%S/Inputs/libomptarget/libomptarget-nvptx-test.bc \
// RUN: -Xopenmp-target -march=sm_52
--cuda-path=%S/Inputs/CUDA_102/usr/local/cuda \
// RUN: -fopenmp-relocatable-target -save-temps %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-BCLIB %s
/// Specify the directory containing the bitcode lib, check clang picks the
right one
-// RUN: %clang -### -fopenmp=libomp -fopenmp-targets=nvptx64-nvidia-cuda \
+// RUN: %clang -### -no-canonical-prefixes -fopenmp=libomp
-fopenmp-targets=nvptx64-nvidia-cuda \
// RUN: --libomptarget-nvptx-bc-path=%S/Inputs/libomptarget \
// RUN: -Xopenmp-target -march=sm_52
--cuda-path=%S/Inputs/CUDA_102/usr/local/cuda \
// RUN: -fopenmp-relocatable-target -save-temps \
// RUN: %s 2>&1 | FileCheck -check-prefix=CHK-BCLIB-DIR %s
/// Create a bogus bitcode library and find it with LIBRARY_PATH
-// RUN: env LIBRARY_PATH=%S/Inputs/libomptarget/subdir %clang -###
-fopenmp=libomp -fopenmp-targets=nvptx64-nvidia-cuda \
+// RUN: env LIBRARY_PATH=%S/Inputs/libomptarget/subdir %clang -###
-no-canonical-prefixes -fopenmp=libomp -fopenmp-targets=nvptx64-nvidia-cuda \
// RUN: -Xopenmp-target -march=sm_52
--cuda-path=%S/Inputs/CUDA_102/usr/local/cuda \
// RUN: -fopenmp-relocatable-target -save-temps \
// RUN: %s 2>&1 | FileCheck -check-prefix=CHK-ENV-BCLIB %s
diff --git a/clang/test/Driver/openmp-offload.c
b/clang/test/Driver/openmp-offload.c
index 38065d9398f45..eaed0d66df75c 100644
--- a/clang/test/Driver/openmp-offload.c
+++ b/clang/test/Driver/openmp-offload.c
@@ -35,7 +35,7 @@
/// ###########################################################################
/// Check -Xopenmp-target=powerpc64le-ibm-linux-gnu -mcpu=pwr7 is passed when
compiling for the device.
-// RUN: %clang -### -fopenmp=libomp
-fopenmp-targets=powerpc64le-ibm-linux-gnu
-Xopenmp-target=powerpc64le-ibm-linux-gnu -mcpu=pwr7 %s 2>&1 \
+// RUN: %clang -### -no-canonical-prefixes -fopenmp=libomp
-fopenmp-targets=powerpc64le-ibm-linux-gnu
-Xopenmp-target=powerpc64le-ibm-linux-gnu -mcpu=pwr7 %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FOPENMP-EQ-TARGET %s
// CHK-FOPENMP-EQ-TARGET: clang{{.*}} "-target-cpu" "pwr7"
{{.*}}"-fopenmp-is-target-device"
@@ -43,7 +43,7 @@
/// ###########################################################################
/// Check -Xopenmp-target -mcpu=pwr7 is passed when compiling for the device.
-// RUN: %clang -### -fopenmp=libomp
-fopenmp-targets=powerpc64le-ibm-linux-gnu -Xopenmp-target -mcpu=pwr7 %s 2>&1 \
+// RUN: %clang -### -no-canonical-prefixes -fopenmp=libomp
-fopenmp-targets=powerpc64le-ibm-linux-gnu -Xopenmp-target -mcpu=pwr7 %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FOPENMP-TARGET %s
// CHK-FOPENMP-TARGET: clang{{.*}} "-target-cpu" "pwr7"
{{.*}}"-fopenmp-is-target-device"
@@ -51,7 +51,7 @@
/// ##########################################################################
/// Check -mcpu=pwr7 is passed to the same triple.
-// RUN: %clang -### -fopenmp=libomp
-fopenmp-targets=powerpc64le-ibm-linux-gnu --target=powerpc64le-ibm-linux-gnu
-mcpu=pwr7 %s 2>&1 \
+// RUN: %clang -### -no-canonical-prefixes -fopenmp=libomp
-fopenmp-targets=powerpc64le-ibm-linux-gnu --target=powerpc64le-ibm-linux-gnu
-mcpu=pwr7 %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FOPENMP-MCPU-TO-SAME-TRIPLE %s
// CHK-FOPENMP-MCPU-TO-SAME-TRIPLE: clang{{.*}} "-target-cpu" "pwr7"
{{.*}}"-fopenmp-is-target-device"
@@ -59,7 +59,7 @@
/// ##########################################################################
/// Check -march=pwr7 is NOT passed to nvptx64-nvidia-cuda.
-// RUN: not %clang -### -fopenmp=libomp
-fopenmp-targets=nvptx64-nvidia-cuda --target=powerpc64le-ibm-linux-gnu
-march=pwr7 %s 2>&1 \
+// RUN: not %clang -### -no-canonical-prefixes -fopenmp=libomp
-fopenmp-targets=nvptx64-nvidia-cuda --target=powerpc64le-ibm-linux-gnu
-march=pwr7 %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FOPENMP-MARCH-TO-GPU %s
// CHK-FOPENMP-MARCH-TO-GPU-NOT: clang{{.*}} "-target-cpu" "pwr7"
{{.*}}"-fopenmp-is-target-device"
@@ -67,7 +67,7 @@
/// ###########################################################################
/// Check -march=pwr7 is NOT passed to x86_64-unknown-linux-gnu.
-// RUN: not %clang -### -fopenmp=libomp
-fopenmp-targets=x86_64-unknown-linux-gnu --target=powerpc64le-ibm-linux-gnu
-march=pwr7 %s 2>&1 \
+// RUN: not %clang -### -no-canonical-prefixes -fopenmp=libomp
-fopenmp-targets=x86_64-unknown-linux-gnu --target=powerpc64le-ibm-linux-gnu
-march=pwr7 %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FOPENMP-MARCH-TO-X86 %s
// CHK-FOPENMP-MARCH-TO-X86-NOT: clang{{.*}} "-target-cpu" "pwr7"
{{.*}}"-fopenmp-is-target-device"
@@ -75,7 +75,7 @@
/// ###########################################################################
/// Check -Xopenmp-target triggers error when multiple triples are used.
-// RUN: not %clang -### -fopenmp=libomp
-fopenmp-targets=powerpc64le-ibm-linux-gnu,powerpc64le-unknown-linux-gnu
-Xopenmp-target -mcpu=pwr8 %s 2>&1 \
+// RUN: not %clang -### -no-canonical-prefixes -fopenmp=libomp
-fopenmp-targets=powerpc64le-ibm-linux-gnu,powerpc64le-unknown-linux-gnu
-Xopenmp-target -mcpu=pwr8 %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FOPENMP-TARGET-AMBIGUOUS-ERROR %s
// CHK-FOPENMP-TARGET-AMBIGUOUS-ERROR: clang{{.*}} error: cannot deduce
implicit triple value for -Xopenmp-target, specify triple using
-Xopenmp-target=<triple>
@@ -83,7 +83,7 @@
/// ###########################################################################
/// Check -Xopenmp-target triggers error when an option requiring arguments is
passed to it.
-// RUN: not %clang -### -fopenmp=libomp
-fopenmp-targets=powerpc64le-ibm-linux-gnu -Xopenmp-target -Xopenmp-target
-mcpu=pwr8 %s 2>&1 \
+// RUN: not %clang -### -no-canonical-prefixes -fopenmp=libomp
-fopenmp-targets=powerpc64le-ibm-linux-gnu -Xopenmp-target -Xopenmp-target
-mcpu=pwr8 %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FOPENMP-TARGET-NESTED-ERROR %s
// CHK-FOPENMP-TARGET-NESTED-ERROR: clang{{.*}} error: invalid -Xopenmp-target
argument: '-Xopenmp-target -Xopenmp-target', options requiring arguments are
unsupported
diff --git a/clang/test/Driver/ve-toolchain.c b/clang/test/Driver/ve-toolchain.c
index 27fde7265afab..86565089e0d89 100644
--- a/clang/test/Driver/ve-toolchain.c
+++ b/clang/test/Driver/ve-toolchain.c
@@ -79,7 +79,7 @@
/// - nld VE specific options
/// - sjlj exception
-// RUN: %clang -### --target=ve-unknown-linux-gnu \
+// RUN: %clang -### -no-canonical-prefixes --target=ve-unknown-linux-gnu \
// RUN: --sysroot %S/Inputs/basic_ve_tree \
// RUN: -resource-dir=%S/Inputs/basic_ve_tree/resource_dir \
// RUN: --unwindlib=none \
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
