Use build root as workdir for shell_command(workdir="") #18813
Merged
Conversation
This file contains 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
chrisjrn
approved these changes
Apr 24, 2023
huonw
added a commit
to huonw/pants
that referenced
this pull request
Apr 25, 2023
…8813) This fixes pantsbuild#18811 by removing the extraneous layer of defaulting of the adhoc tool workdir arguments: it already has `default="."`, which I think means `.value` will never be `None`. Previously, tests like `field.value or "."` or `if not field.value: ...` would use the fallback case for `""`, and, for `shell_command` that extra fallback (`"."`) doesn't match the documented behaviour: > * `/` or the empty string specifies the build root. This adjusts the adhoc tool tests to explicitly check the working directory by checking `$PWD` (previously they were testing the combination of working directory and root output directory, by checking file locations), although no fix was required to `adhoc_tool`.
huonw
added a commit
that referenced
this pull request
Apr 26, 2023
#18813) (#18832) This fixes #18811 by removing the extraneous layer of defaulting of the adhoc tool workdir arguments: it already has `default="."`, which I think means `.value` will never be `None`. Previously, tests like `field.value or "."` or `if not field.value: ...` would use the fallback case for `""`, and, for `shell_command` that extra fallback (`"."`) doesn't match the documented behaviour: > * `/` or the empty string specifies the build root. This adjusts the adhoc tool tests to explicitly check the working directory by checking `$PWD` (previously they were testing the combination of working directory and root output directory, by checking file locations), although no fix was required to `adhoc_tool`.
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.
This fixes #18811 by removing the extraneous layer of defaulting of the adhoc tool workdir arguments: it already has
default=".", which I think means.valuewill never beNone.Previously, tests like
field.value or "."orif not field.value: ...would use the fallback case for"", and, forshell_commandthat extra fallback (".") doesn't match the documented behaviour:This adjusts the adhoc tool tests to explicitly check the working directory by checking
$PWD(previously they were testing the combination of working directory and root output directory, by checking file locations), although no fix was required toadhoc_tool.