Branch: refs/heads/master
Revision: e318a2b
Author: ronawho
Log Message:
Merge pull request #16812 from ronawho/chplenv-subtest-read-file
Replace chplenv variables in ReadFileWithComments
[reviewed by @ben-albrecht and @lydia-duncan]
ReadFileWithComments and runSkipIf are responsible for reading most
testing infrastructure files in sub_test. Both can either just read in a
non-executable file or run an executable file and read in the output.
runSkipIf will inject the chplenv for executable and non-executable
files, but ReadFileWithComments was only doing so for executable
files.
For non-executable files ReadFileWithComments was only injecting
env vars. Update it to inject chplenv vars as well.
Related prior work:
- https://github.com/chapel-lang/chapel/commit/407f09565165d0181ce95473416f4a74ee1e2da4
- https://github.com/chapel-lang/chapel/commit/fe51b2f45e047ce7cbc2e586caf5548ba7616b19
- https://github.com/chapel-lang/chapel/commit/4b1eeb4a3d05b58335af0a943cd20a7fa33484c2
See https://github.com/chapel-lang/chapel/pull/16805 for motivation
Modified Files:
M test/library/packages/ProtobufProtocolSupport/EXECENV
M test/library/packages/UnitTest/EXECENV
M test/mason/EXECENV
M test/mason/mason-offline/EXECENV
M test/mason/search/EXECENV
M test/mason/search/badFileName/EXECENV
M test/mason/search/cacheTest/EXECENV
M test/patterns/cltools/fileCompile/chplCompile.execenv
M util/test/sub_test.py
Compare: https://github.com/chapel-lang/chapel/compare/2e5f9504121e...e318a2b9a142