test: Location expand environment variables

bazelbuild · Mar 1, 2024 · 04406a2 · 04406a2
1 parent 92fef4e
commit 04406a2
Showing 1 changed file with 8 additions and 34 deletions.
diff --git a/scala/private/phases/phase_test_environment.bzl b/scala/private/phases/phase_test_environment.bzl
@@ -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,
+            ),
+        },
+    )