-
Notifications
You must be signed in to change notification settings - Fork 14.7k
[Test] Adjust quoting in archive-thin.test for spaces in paths #151707
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Test] Adjust quoting in archive-thin.test for spaces in paths #151707
Conversation
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).
@llvm/pr-subscribers-lld-elf @llvm/pr-subscribers-lld Author: bd1976bris (bd1976bris) ChangesAs suggested in review (see: #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: #146749). Full diff: https://github.com/llvm/llvm-project/pull/151707.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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
/cherry-pick 73ce0ac |
Failed to cherry-pick: 73ce0ac https://github.com/llvm/llvm-project/actions/runs/16678563179 Please manually backport the fix and push it to your github fork. Once this is done, please create a pull request |
@tru the backport request for this failed. See my comment #151674 (review) on #151674 |
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/3/builds/19934 Here is the relevant piece of the build log for the reference
|
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 \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is ok , but the idiomatic way is to use outer single quotes and inner double quotes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed. I'll make that work and then adjust all the tests - I have used this pattern in a few places.
As suggested in review (see: #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: #146749).