Test for good cache usage

bazelbuild · Sep 23, 2024 · fbdfdff · fbdfdff
1 parent 0aa813c
commit fbdfdff
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
@@ -174,6 +174,10 @@ public Map<PathFragment, Artifact> getMapping() {
           return result;
         }
 
+        if (!mappingRequestedBefore.compareAndSet(false, true)) {
+          throw new IllegalStateException(
+              "Runfiles mapping recomputed more than once despite caching enabled: " + execPath);
+        }
         result =
             runfiles.getRunfilesInputs(
                 /* eventHandler= */ null, /* location= */ null, repoMappingManifest);
@@ -252,7 +256,7 @@ public String getWorkspaceName() {
   // for reusing the runfiles within a single build, so don't pay the overhead of a weak reference.
   private static boolean cacheRunfilesMappings(RuleContext ruleContext) {
     if (!TargetUtils.isTestRule(ruleContext.getTarget())) {
-      return false;
+      return true;
     }
 
     if (TestActionBuilder.getRunsPerTest(ruleContext) > 1) {