Branch: refs/heads/master
Revision: 13c9a7e
Author: mppf
Log Message:
Merge pull request #16669 from mppf/dont-use-activate
Adjust env vars instead of using venv activate
Follow-up to PR #16644 and #16560
This PR (along with PR #16663) is intended to resolve warnings in nightly
testing like this
[Warning: could not import filelock]
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).
So, this PR changes run-in-venv.bash and run-in-test-venv.bash to
adjust environment variables directly rather that using the activate
script. It also adjusts c2chapel to use run-in-venv.bash instead of the
activate script.
Reviewed by @lydia-duncan - thanks!
- [x] test/c2chapel and test/chpldoc pass after building chpldoc and c2chapel
- [x] full local testing
Modified Files:
M third-party/chpl-venv/Makefile
M tools/c2chapel/c2chapel
M util/config/run-in-venv.bash
M util/test/run-in-test-venv.bash
Compare: https://github.com/chapel-lang/chapel/compare/6374efdd0ce8...13c9a7e9810e