[Driver] Add -- to some test clang-cl command lines.
#70055
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-clang @llvm/pr-subscribers-clang-driver Author: Simon Tatham (statham-arm) ChangesIf clang/test/Driver/cl-offload.cu is run on Unix in a directory whose absolute pathname starts with Other clang-cl tests take care to put a Full diff: https://github.com/llvm/llvm-project/pull/70055.diff 1 Files Affected:
diff --git a/clang/test/Driver/cl-offload.cu b/clang/test/Driver/cl-offload.cu
index 650c13da15b5b58..eaa4b58afa8878b 100644
--- a/clang/test/Driver/cl-offload.cu
+++ b/clang/test/Driver/cl-offload.cu
@@ -5,11 +5,11 @@
// RUN: %clang_cl -### -target x86_64-pc-windows-msvc --offload-arch=sm_35 -fgpu-rdc \
// RUN: --cuda-path=%S/Inputs/CUDA/usr/local/cuda \
-// RUN: /Wall -x cuda %s 2>&1 \
+// RUN: /Wall -x cuda -- %s 2>&1 \
// RUN: | FileCheck %s -check-prefix=CUDA
// RUN: %clang_cl -### -target x86_64-pc-windows-msvc --offload-arch=gfx1010 -fgpu-rdc --hip-link \
-// RUN: --rocm-path=%S/Inputs/rocm /Wall -x hip %s 2>&1 \
+// RUN: --rocm-path=%S/Inputs/rocm /Wall -x hip -- %s 2>&1 \
// RUN: | FileCheck %s -check-prefix=HIP
// CUDA: "-cc1" "-triple" "nvptx64-nvidia-cuda" "-aux-triple" "x86_64-pc-windows-msvc"
|
|
can you remove // REQUIRES: !system-darwin ? Thanks. |
If clang/test/Driver/cl-offload.cu is run on Unix in a directory whose absolute pathname starts with `/w`, such as the `/workspace` used by at least some Jenkins CI setups, then the file name on the clang command line is misinterpreted as some kind of MSVC warning-control option, and ignored by the catch-all `_SLASH_w` option in Options.td. Other clang-cl tests take care to put a `--` before the input file name, to force clang to treat it as a filename even if it starts with a / and accidentally looks like a cl option. Do the same here. This also allows the exclusion for `system-darwin` to be removed, because that was trying to avoid a similar filename/option clash involving `/Users`.
e5b9048 to
029eecc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If clang/test/Driver/cl-offload.cu is run on Unix in a directory whose absolute pathname starts with
/w, such as the/workspaceused by at least some Jenkins CI setups, then the file name on the clang command line is misinterpreted as some kind of MSVC warning-control option, and ignored by the catch-all_SLASH_woption in Options.td.Other clang-cl tests take care to put a
--before the input file name, to force clang to treat it as a filename even if it starts with a / and accidentally looks like a cl option. Do the same here.