release/21.x: [Test] Adjust quoting in archive-thin.test for spaces in paths (#151707) #152120
Conversation
…151707) As suggested in review (see: llvm#149425), I believed that using single quotes was a nicer quoting scheme that correctly handled paths with spaces. Alas, build bot failures have demonstrated that this is not the case. Revert to the original quoting scheme (see: llvm#146749). (cherry picked from commit 73ce0ac)
|
@bd1976bris What do you think about merging this PR to the release branch? |
|
@llvm/pr-subscribers-lld @llvm/pr-subscribers-lld-elf Author: None (llvmbot) ChangesBackport 73ce0ac Requested by: @bd1976bris Full diff: https://github.com/llvm/llvm-project/pull/152120.diff 1 Files Affected:
diff --git a/lld/test/ELF/dtlto/archive-thin.test b/lld/test/ELF/dtlto/archive-thin.test
index bcd5f138459b0..df3c2aadb06eb 100644
--- a/lld/test/ELF/dtlto/archive-thin.test
+++ b/lld/test/ELF/dtlto/archive-thin.test
@@ -29,9 +29,9 @@ RUN: mkdir %t/out && cd %t/out
## received JSON, pretty-prints the JSON and the supplied arguments, and then
## exits with an error. This allows FileCheck directives to verify the
## distributor inputs.
-RUN: echo '%t/t1.a %t/lib/t2.a ../t3.a \
-RUN: --thinlto-distributor="%python" \
-RUN: --thinlto-distributor-arg="%llvm_src_root/utils/dtlto/validate.py"' > rsp
+RUN: echo "%t/t1.a %t/lib/t2.a ../t3.a \
+RUN: --thinlto-distributor=\"%python\" \
+RUN: --thinlto-distributor-arg=\"%llvm_src_root/utils/dtlto/validate.py\"" > rsp
## Link thin archives using -u/--undefined.
RUN: not ld.lld @rsp -u t1 -u t2 -u t3 2>&1 | FileCheck %s
|
There was a problem hiding this comment.
LGTM. @tru this needs to be merged ASAP. Without this there will be a failure on some build bots from #151707 which was recently merged onto the release branch, see: #151707 (comment).
github-project-automation
bot
moved this from Needs Triage
to Needs Merge
in LLVM Release Status
github-project-automation
bot
moved this from Needs Merge
to Done
in LLVM Release Status
|
@bd1976bris (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR. |
Backport 73ce0ac
Requested by: @bd1976bris