Fix issue with chplconfig not supporting variables with equals signs #26178
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
Signed-off-by: Jade Abraham <[email protected]>
e-kayrakli
approved these changes
Oct 30, 2024
bradcray
added a commit
to bradcray/chapel
that referenced
this pull request
Oct 31, 2024
…ings.chpl working While paratesting my branch tonight, I found that chplenv/chplconfig/warnings/warnings.chpl was failing due to PR chapel-lang#26178. Though I'm not that familiar with this logic, it seems that reverting half of the changes in it keeps this test working as expected, though it may suggest we need to do more to both achieve the PR's aim and also keep errors for cases like this. --- Signed-off-by: Brad Chamberlain <[email protected]>
bradcray
added a commit
that referenced
this pull request
Oct 31, 2024
…orking (#26180) [reviewed by @DanilaFe ] While paratesting my branch tonight, I found that chplenv/chplconfig/warnings/warnings.chpl was failing due to PR #26178. Though I'm not that familiar with this logic, it seems that reverting half of the changes in it keeps this test working as expected, though it may suggest we need to do more to both achieve the PR's aim and also keep errors for cases like this.
jabraham17
added a commit
that referenced
this pull request
Oct 31, 2024
Properly handles the parsing of chplconfig files. #26178 added the ability to parse chplconfig variables with values including `=`, but that broke the warning for something like `CHPL_VAR==value`. This PR resolves the issue by refactoring some of the parsing code in `overrides.py` to check error cases in `skip_line`, rather than relying on python exceptions. Then to avoid duplication of logic, renames `skip_line` to `check_line` and has it return the parsed variable. Fixes the issue introduced in #26178 and reverts #26180 Tested by running `start_test test/chplenv` [Reviewed by @DanilaFe]
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.
Fixes an issue where if a
chplconfigfile has a variable with a value that contains an equals sign, it will break with an error likeWarning: Syntax Error: $CHPL_HOME/chplconfig:line.This resolves an issue a user saw on a system where
--gcc-toolchain=...was apart of the definition forCHPL_TARGET_CC/CXX[Reviewed by @e-kayrakli]