Fixup #9614: make config file extraction from help text more robust #9667
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
andreasabel
added
attention: needs-review
cabal-testsuite
re: config-file
geekosaur
approved these changes
Jan 28, 2024
ffaf1
approved these changes
Jan 28, 2024
cabal-testsuite/PackageTests/Help/HelpPrintsConfigFile/help-prints-config-file.test.hs
Outdated
Show resolved
Hide resolved
|
Thanks for the reviews! CI fails on WIndows: I seem to have a CRLF issue on Windows. Hang on, I'll submit a patch. |
geekosaur
approved these changes
Jan 28, 2024
ffaf1
approved these changes
Jan 28, 2024
andreasabel
added
squash+merge me
mergify
bot
added
the
merge delay passed
erikd
pushed a commit
to erikd/cabal
that referenced
this pull request
Apr 22, 2024
…obust (haskell#9667) * Fixup haskell#9614: make config file extraction from help text more robust The previous test (PR haskell#9614) did not work when the config file was absent, because then the help text would add one more line at the end (see issue haskell#535). The new test looks for the exact line printed before the line with the config file. We test both scenarios, with config file present or absent. * Trim lines before searching the marker to work around CRLF issues. --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
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.
The previous test (PR #9614) did not work when the config file was absent, because then the help text would add one more line at the end (see issue #535).
The new test looks for the exact line printed before the line with the config file.
We test both scenarios, with config file present or absent.
See: #9614 (comment)