From 2dea9d1c66cd2d6c82616f9a3138cd8e3a4fb84f Mon Sep 17 00:00:00 2001
From: messa <messa@google.com>
Date: Mon, 8 Mar 2021 01:27:29 -0800
Subject: [PATCH] Adding test for caching starlark action's inputs if it
 shadows an action that discovers inputs.

The test was missing in https://github.com/bazelbuild/bazel/commit/2adf7d1377f08f996ddee2eb21f63378df8c99c5.

PiperOrigin-RevId: 361508612
---
 .../shell/integration/action_aspect_test.sh   | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/src/test/shell/integration/action_aspect_test.sh b/src/test/shell/integration/action_aspect_test.sh
index 37e94d5bdce0cd..9ae90e7e4c0587 100755
--- a/src/test/shell/integration/action_aspect_test.sh
+++ b/src/test/shell/integration/action_aspect_test.sh
@@ -233,4 +233,97 @@ EOF
       || fail "aspect params file does not contain tree artifact args"
 }
 
+# Test the inputs cache of Starlark actions triggered from aspects
+function test_starlark_action_inputs_cache() {
+  local package="a"
+  mkdir -p "${package}"
+
+  cat > "${package}/lib.bzl" <<EOF
+def _actions_test_impl(target, ctx):
+    compile_action = None
+
+    for action in target.actions:
+      if action.mnemonic == "CppCompile":
+        compile_action = action
+
+    if not compile_action:
+      fail("Couln't find compile action")
+
+    aspect_out = ctx.actions.declare_file("run_timestamp")
+    ctx.actions.run_shell(
+        shadowed_action = compile_action,
+        mnemonic = "AspectAction",
+        outputs = [aspect_out],
+        # record the timestamp in output file to validate action rerun
+        command = "cat ${package}/x.h > %s & date >> %s" % (
+            aspect_out.path,
+            aspect_out.path,
+        ),
+    )
+
+    return [OutputGroupInfo(out = [aspect_out])]
+
+actions_test_aspect = aspect(implementation = _actions_test_impl)
+EOF
+
+echo "inline int x() { return 42; }" > "${package}/x.h"
+  cat > "${package}/a.cc" <<EOF
+#include "${package}/x.h"
+
+int a() { return x(); }
+EOF
+  cat > "${package}/BUILD" <<EOF
+cc_library(
+  name = "x",
+  hdrs  = ["x.h"],
+)
+
+cc_library(
+  name = "a",
+  srcs = ["a.cc"],
+  deps = [":x"],
+)
+EOF
+
+  bazel build "${package}:a" \
+      --aspects="//${package}:lib.bzl%actions_test_aspect" \
+      --output_groups=out \
+      --experimental_shadowed_action || \
+      fail "bazel build should've succeeded"
+
+  cp "bazel-bin/${package}/run_timestamp" "${package}/run_1_timestamp"
+
+  # Test that the Starlark action is not rerun after bazel shutdown if
+  # the inputs did not change
+  bazel shutdown
+
+  bazel build "${package}:a" \
+      --aspects="//${package}:lib.bzl%actions_test_aspect" \
+      --output_groups=out \
+      --experimental_shadowed_action || \
+      fail "bazel build should've passed"
+
+  cp "bazel-bin/${package}/run_timestamp" "${package}/run_2_timestamp"
+
+  diff "${package}/run_1_timestamp" "${package}/run_2_timestamp" \
+      || fail "Starlark action should not rerun after bazel shutdown"
+
+  # Test that the Starlark action would rerun if the inputs of the
+  # shadowed action changed
+  rm "${package}/x.h"
+  echo "inline int x() { return 0; }" > "${package}/x.h"
+
+  bazel build "${package}:a" \
+      --aspects="//${package}:lib.bzl%actions_test_aspect" \
+      --output_groups=out \
+      --experimental_shadowed_action || \
+      fail "bazel build should've passed"
+
+  cp "bazel-bin/${package}/run_timestamp" "${package}/run_3_timestamp"
+
+  diff "${package}/run_1_timestamp" "${package}/run_3_timestamp" \
+      && fail "Starlark action should rerun after shadowed action inputs change" \
+      || :
+}
+
 run_suite "Tests Starlark API pertaining to action inspection via aspect"