From 1cb03967c5e2af20e64d67ff4285389cc8527939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98ystein=20Hovind?= <oystein@ascenium.com>
Date: Fri, 1 Mar 2024 10:08:50 +0100
Subject: [PATCH] test: Location expand environment variables

---
 .../private/phases/phase_test_environment.bzl | 42 ++++---------------
 1 file changed, 8 insertions(+), 34 deletions(-)

diff --git a/scala/private/phases/phase_test_environment.bzl b/scala/private/phases/phase_test_environment.bzl
index cdc20f66a..ed2f47a60 100644
--- 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,
+            ),
+        },
+    )