Include execution info in TestRunner cache key.
RELNOTES: None.
PiperOrigin-RevId: 244706258
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
index f82ba6f..2c45402 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
@@ -344,6 +344,7 @@
fp.addInt(runNumber);
fp.addInt(testConfiguration.getRunsPerTestForLabel(getOwner().getLabel()));
fp.addInt(configuration.isCodeCoverageEnabled() ? 1 : 0);
+ fp.addStringMap(getExecutionInfo());
}
@Override
diff --git a/src/test/shell/integration/modify_execution_info_test.sh b/src/test/shell/integration/modify_execution_info_test.sh
index db91d47..52d0778 100755
--- a/src/test/shell/integration/modify_execution_info_test.sh
+++ b/src/test/shell/integration/modify_execution_info_test.sh
@@ -298,4 +298,22 @@
assert_equals "$(cat output1)" "$(cat output2)"
}
+# Regression test for b/130762259.
+function test_modify_execution_info_changes_test_runner_cache_key() {
+ local pkg="${FUNCNAME[0]}"
+ mkdir -p "$pkg"
+ echo "sh_test(name = 'test', srcs = ['test.sh'])" > "$pkg/BUILD"
+ touch "$pkg/test.sh"
+
+ bazel aquery "mnemonic(TestRunner,//$pkg:test)" --output=text \
+ --modify_execution_info= \
+ 2> "$TEST_log" | grep ActionKey > key1 || fail "Expected success"
+
+ bazel aquery "mnemonic(TestRunner,//$pkg:test)" --output=text \
+ --modify_execution_info=TestRunner=+requires-x \
+ 2> "$TEST_log" | grep ActionKey > key2 || fail "Expected success"
+
+ assert_not_equals "$(cat key1)" "$(cat key2)"
+}
+
run_suite "Integration tests of the --modify_execution_info option."
