Skip to content

test: Location expand environment variables #1572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

test: Location expand environment variables #1572

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 8 additions & 34 deletions scala/private/phases/phase_test_environment.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,11 @@
# https://bazel.build/rules/lib/testing#TestEnvironment

def phase_test_environment(ctx, p):
test_env = ctx.attr.env
inherited_environment = ctx.attr.env_inherit

if inherited_environment and test_env:
return struct(
external_providers = {
"TestingEnvironment": testing.TestEnvironment(
test_env,
inherited_environment,
),
},
)

elif test_env:
return struct(
external_providers = {
"TestingEnvironment": testing.TestEnvironment(
test_env,
),
},
)

elif inherited_environment:
return struct(
external_providers = {
"TestingEnvironment": testing.TestEnvironment(
{},
inherited_environment,
),
},
)

else:
return struct()
return struct(
external_providers = {
"TestingEnvironment": testing.TestEnvironment(
{k: ctx.expand_location(v, ctx.attr.data) for k, v in ctx.attr.env.items()},
ctx.attr.env_inherit,
),
},
)