From 08ef9b200d1b62ed66e10d89d32c709b70e7adbd Mon Sep 17 00:00:00 2001
From: Googler <jcater@google.com>
Date: Thu, 6 Jun 2024 15:18:19 -0700
Subject: [PATCH] Ensure that packages are invalidated any time package or
 build language options are changed.

This prevents issues where incomplete skyframe nodes are still cached when
tests change state.

Work towards platform-based flags: #19409.

PiperOrigin-RevId: 641037026
Change-Id: Ibb2ba4b1413b516d2f2214244d3f536fb5583ca7
---
 .../devtools/build/lib/analysis/util/BuildViewTestCase.java     | 2 ++
 .../devtools/build/lib/starlark/StarlarkIntegrationTest.java    | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index c1cad38f18e635..7d80e235c669b0 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -525,11 +525,13 @@ private void setUpSkyframe() {
   protected void setPackageOptions(String... options) throws Exception {
     packageOptions = parsePackageOptions(options);
     setUpSkyframe();
+    invalidatePackages(/* alsoConfigs= */ false);
   }
 
   protected void setBuildLanguageOptions(String... options) throws Exception {
     buildLanguageOptions = parseBuildLanguageOptions(options);
     setUpSkyframe();
+    invalidatePackages(/* alsoConfigs= */ false);
   }
 
   private static PackageOptions parsePackageOptions(String... options) throws Exception {
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
index 05ade6e582fa43..1c092c130c0146 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
@@ -3473,7 +3473,6 @@ public void testLicenseType() throws Exception {
     // (See --incompatible_no_attr_license). However, this verifies that until the attribute
     // is removed, values of the attribute are a valid Starlark type.
     setBuildLanguageOptions("--incompatible_no_attr_license=false");
-    invalidatePackages();
     scratch.file(
         "test/rule.bzl",
         """