Adjust env vars instead of using venv activate #16669
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
lydia-duncan
approved these changes
Nov 5, 2020
mppf
force-pushed
the
dont-use-activate
branch
from
63ead1d
to
aade1bc
Compare
Add comments, use && in some commands where that was intended --- Signed-off-by: Michael Ferguson <mppf@users.noreply.github.com>
The venv activate script stores the absolute path but that causes problems in case it changes (e.g. if CHPL_HOME is renamed or in the case of module builds) --- Signed-off-by: Michael Ferguson <mppf@users.noreply.github.com>
mppf
force-pushed
the
dont-use-activate
branch
from
aade1bc
to
4bf9222
Compare
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.
Follow-up to PR #16644 and #16560
This PR (along with PR #16663) is intended to resolve warnings in nightly
testing like this
The venv activate script stores the absolute path but that causes
problems in case it changes (e.g. if
CHPL_HOMEis renamed or in thecase of module builds).
So, this PR changes
run-in-venv.bashandrun-in-test-venv.bashtoadjust environment variables directly rather that using the activate
script. It also adjusts c2chapel to use
run-in-venv.bashinstead of theactivate script.
Reviewed by @lydia-duncan - thanks!