Skip to content

[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

Merged

Conversation

bd1976bris
Copy link
Collaborator

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).

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).
@llvmbot
Copy link
Member

llvmbot commented Aug 1, 2025

@llvm/pr-subscribers-lld-elf

@llvm/pr-subscribers-lld

Author: bd1976bris (bd1976bris)

Changes

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).


Full diff: https://github.com/llvm/llvm-project/pull/151707.diff

1 Files Affected:

  • (modified) lld/test/ELF/dtlto/archive-thin.test (+3-3)
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

Copy link
Collaborator

@dyung dyung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@github-project-automation github-project-automation bot moved this from Needs Triage to Needs Merge in LLVM Release Status Aug 1, 2025
@bd1976bris bd1976bris merged commit 73ce0ac into llvm:main Aug 1, 2025
12 checks passed
@github-project-automation github-project-automation bot moved this from Needs Merge to Done in LLVM Release Status Aug 1, 2025
@bd1976bris
Copy link
Collaborator Author

/cherry-pick 73ce0ac

@llvmbot
Copy link
Member

llvmbot commented Aug 1, 2025

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

@bd1976bris
Copy link
Collaborator Author

@tru the backport request for this failed. See my comment #151674 (review) on #151674

@llvm-ci
Copy link
Collaborator

llvm-ci commented Aug 1, 2025

LLVM Buildbot has detected a new failure on builder arc-builder running on arc-worker while building lld at step 6 "test-build-unified-tree-check-all".

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
Step 6 (test-build-unified-tree-check-all) failure: 1200 seconds without output running [b'ninja', b'check-all'], attempting to kill
...
8.519 [12/18/29] Linking CXX executable unittests/MC/MCTests
9.001 [11/18/30] Linking CXX executable unittests/ObjectYAML/ObjectYAMLTests
9.015 [10/18/31] Linking CXX executable unittests/Frontend/LLVMFrontendTests
9.040 [9/18/32] Linking CXX executable unittests/DebugInfo/DWARF/DebugInfoDWARFTests
11.089 [8/18/33] Linking CXX executable unittests/ProfileData/ProfileDataTests
11.184 [7/18/34] Linking CXX executable unittests/SandboxIR/SandboxIRTests
11.237 [6/18/35] Linking CXX executable unittests/ExecutionEngine/MCJIT/MCJITTests
11.472 [5/18/36] Linking CXX executable unittests/Analysis/AnalysisTests
11.720 [4/18/37] Linking CXX executable unittests/XRay/XRayTests
13.247 [3/18/38] Linking CXX executable tools/lld/unittests/AsLibELF/LLDAsLibELFTests
command timed out: 1200 seconds without output running [b'ninja', b'check-all'], attempting to kill
process killed by signal 9
program finished with exit code -1
elapsedTime=1350.952891

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 \
Copy link
Member

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

Copy link
Collaborator Author

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

5 participants