Make env on test rules override --test_env

keith · copybara-github · commit 01a90d64c427 · 2024-05-21T03:05:26.000-07:00
Fixes #14418 Closes #22420. PiperOrigin-RevId: 635740423 Change-Id: Iffd4d172c4175be2e1b6cfad04ddad2759adb987
diff --git a/src/main/java/com/google/devtools/build/lib/exec/TestPolicy.java b/src/main/java/com/google/devtools/build/lib/exec/TestPolicy.java
@@ -87,18 +87,19 @@ public Map<String, String> computeTestEnvironment(
       env.put(entry.getKey(), val);
     }
 
-    // Rule-specified test env.
-    testAction.getExtraTestEnv().resolve(env, clientEnv);
-
     // Overwrite with the environment common to all actions, see --action_env.
     testAction.getConfiguration().getActionEnvironment().resolve(env, clientEnv);
 
     // Overwrite with the environment common to all tests, see --test_env.
     testAction.getConfiguration().getTestActionEnvironment().resolve(env, clientEnv);
 
+    // Rule-specified test env.
+    testAction.getExtraTestEnv().resolve(env, clientEnv);
+
     // Setup any test-specific env variables; note that this does not overwrite existing values for
     // TEST_RANDOM_SEED or TEST_SIZE if they're already set.
     testAction.setupEnvVariables(env, timeout);
+
     return env;
   }
 }
diff --git a/src/test/shell/bazel/bazel_test_test.sh b/src/test/shell/bazel/bazel_test_test.sh
@@ -144,6 +144,59 @@ EOF
   expect_log "ws: _main$"
 }
 
+function test_env_vars_override() {
+  cat > WORKSPACE <<EOF
+workspace(name = "bar")
+EOF
+  add_rules_cc_to_workspace WORKSPACE
+  mkdir -p foo
+  cat > foo/testenv.sh <<'EOF'
+#!/bin/sh
+echo "foo: $FOO"
+echo "bar: $BAR"
+echo "baz: $BAZ"
+echo "test_size: $TEST_SIZE"
+echo "ws: $TEST_WORKSPACE"
+EOF
+  chmod +x foo/testenv.sh
+  cat > foo/BUILD <<EOF
+sh_test(
+    name = "foo",
+    srcs = ["testenv.sh"],
+    size = "small",
+    env = {
+      "FOO": "frombuild",
+      "TEST_SIZE": "ignored",
+    },
+    env_inherit = [
+      "BAZ"
+    ],
+)
+EOF
+
+  # Test BAR is set from --action_env
+  BAZ=fromaction bazel --ignore_all_rc_files test --test_output=all \
+    --action_env=BAR=fromcli --action_env=BAZ \
+    //foo &> $TEST_log || fail "Test failed"
+  expect_log "foo: frombuild"
+  expect_log "bar: fromcli"
+  expect_log "baz: fromaction"
+  expect_log "test_size: small"
+  expect_log "ws: _main$"
+
+  # Test FOO from the BUILD file wins
+  # Test BAR is set from --test_env
+  # Test BAZ is set from --test_env
+  BAZ=fromtest bazel --ignore_all_rc_files test --test_output=all \
+    --action_env=FOO=fromcli --test_env=FOO=fromcli --test_env=BAR=fromcli \
+    --test_env=BAZ //foo &> $TEST_log || fail "Test failed"
+  expect_log "foo: frombuild"
+  expect_log "bar: fromcli"
+  expect_log "baz: fromtest"
+  expect_log "test_size: small"
+  expect_log "ws: _main$"
+}
+
 function test_runfiles_java_runfiles_merges_env_vars() {
   runfiles_merges_runfiles_env_vars JAVA_RUNFILES PYTHON_RUNFILES
 }
