skyfocus: create SkyfocusIntegrationTest as a Java integration test.

focus_test takes a while to run now, and running a debugger over it isn't as straightforward as a Java integration test. It'll make testing subsequent CLs easier.

This CL starts by moving the smoke test to the Java version. The Skyfocus preparation and execution steps are also moved into `CommandEnvironment` and `BuildTool` respectively, so we don't need to change `BlazeRuntimeWrapper` which mimics `BlazeCommandDispatcher`.

PiperOrigin-RevId: 622759922
Change-Id: I404f30dd957bfea521ddb2af980531bfd641f841

Author: jin

src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java

@@ -282,6 +282,10 @@ public void buildTargets(BuildRequest request, BuildResult result, TargetValidat
         // The workspace status actions will not run with certain flags, or if an error occurs early
         // in the build. Ensure that build info is posted on every build.
         env.ensureBuildInfoPosted();
+
+        // Skyfocus runs at the end of the build.
+        env.getSkyframeExecutor()
+            .runSkyfocus(env.getReporter(), env.getBlazeWorkspace().getPersistentActionCache());
       }
     }
   }
@@ -559,11 +563,6 @@ public BuildResult processRequest(
               InterruptedFailureDetails.detailedExitCode("post build callback interrupted");
         }
       }
-
-      if (detailedExitCode.isSuccess()) {
-        env.getSkyframeExecutor()
-            .runSkyfocus(env.getReporter(), env.getBlazeWorkspace().getPersistentActionCache());
-      }
     } catch (BuildFailedException e) {
       if (!e.isErrorAlreadyShown()) {
         // The actual error has not already been reported by the Builder.

src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java

@@ -52,7 +52,6 @@
 import com.google.devtools.build.lib.server.FailureDetails;
 import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
 import com.google.devtools.build.lib.skyframe.RepositoryMappingValue.RepositoryMappingResolutionException;
-import com.google.devtools.build.lib.skyframe.SkyfocusOptions;
 import com.google.devtools.build.lib.util.AbruptExitException;
 import com.google.devtools.build.lib.util.AnsiStrippingOutputStream;
 import com.google.devtools.build.lib.util.DebugLoggerConfigurator;
@@ -563,18 +562,6 @@ private BlazeCommandResult execExclusively(
         return result;
       }
 
-      if (env.commandActuallyBuilds()) {
-        // Need to determine if Skyfocus will run for this command. If so, the evaluator
-        // will need to be configured to remember additional state (e.g. root keys) that it
-        // otherwise doesn't need to for a non-Skyfocus build. Alternately, it might reset
-        // the evaluator, which is why this runs before injecting precomputed values below.
-        env.getSkyframeExecutor()
-            .prepareForSkyfocus(
-                env.getOptions().getOptions(SkyfocusOptions.class),
-                env.getReporter(),
-                env.getRuntime().getProductName());
-      }
-
       for (BlazeModule module : runtime.getBlazeModules()) {
         try (SilentCloseable closeable =
             Profiler.instance().profile(module + ".injectExtraPrecomputedValues")) {

src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java

@@ -48,6 +48,7 @@
 import com.google.devtools.build.lib.server.FailureDetails;
 import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
 import com.google.devtools.build.lib.skyframe.BuildResultListener;
+import com.google.devtools.build.lib.skyframe.SkyfocusOptions;
 import com.google.devtools.build.lib.skyframe.SkyframeBuildView;
 import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
 import com.google.devtools.build.lib.skyframe.WorkspaceInfoFromDiff;
@@ -842,6 +843,15 @@ public void beforeCommand(InvocationPolicy invocationPolicy) throws AbruptExitEx
 
     // Modules that are subscribed to CommandStartEvent may create pending exceptions.
     throwPendingException();
+
+    if (commandActuallyBuilds()) {
+      // Need to determine if Skyfocus will run for this command. If so, the evaluator
+      // will need to be configured to remember additional state (e.g. root keys) that it
+      // otherwise doesn't need to for a non-Skyfocus build. Alternately, it might reset
+      // the evaluator, which is why this runs before injecting precomputed values below.
+      skyframeExecutor.prepareForSkyfocus(
+          options.getOptions(SkyfocusOptions.class), reporter, runtime.getProductName());
+    }
   }
 
   /** Returns the name of the file system we are writing output to. */

src/test/java/com/google/devtools/build/lib/buildtool/BUILD

@@ -744,6 +744,15 @@ java_test(
     ],
 )
 
+java_test(
+    name = "SkyfocusIntegrationTest",
+    srcs = ["SkyfocusIntegrationTest.java"],
+    deps = [
+        "//src/test/java/com/google/devtools/build/lib/buildtool/util",
+        "//third_party:junit4",
+    ],
+)
+
 java_test(
     name = "ProjectResolutionTest",
     srcs = ["ProjectResolutionTest.java"],

src/test/java/com/google/devtools/build/lib/buildtool/SkyfocusIntegrationTest.java

@@ -0,0 +1,51 @@
+// Copyright 2024 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.buildtool;
+
+import com.google.devtools.build.lib.buildtool.util.BuildIntegrationTestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Skyfocus integration tests */
+@RunWith(JUnit4.class)
+public final class SkyfocusIntegrationTest extends BuildIntegrationTestCase {
+
+  @Override
+  protected void setupOptions() throws Exception {
+    super.setupOptions();
+    addOptions("--experimental_enable_skyfocus");
+  }
+
+  @Test
+  public void workingSet_canBeUsedWithBuildCommand() throws Exception {
+    addOptions("--experimental_working_set=hello/x.txt", "--experimental_skyfocus_dump_keys=count");
+    write("hello/x.txt", "x");
+    write(
+        "hello/BUILD",
+        """
+        genrule(
+            name = "target",
+            srcs = ["x.txt"],
+            outs = ["out"],
+            cmd = "cat $< > $@",
+        )
+        """);
+
+    buildTarget("//hello/...");
+    assertContainsEvent("Updated working set successfully.");
+    assertContainsEvent("Focusing on");
+    assertContainsEvent("Node count:");
+  }
+}

src/test/shell/integration/focus_test.sh

@@ -70,26 +70,6 @@ function set_up() {
   export DONT_SANITY_CHECK_SERIALIZATION=1
 }
 
-function test_working_set_can_be_used_with_build_command() {
-  local -r pkg=${FUNCNAME[0]}
-  mkdir ${pkg}|| fail "cannot mkdir ${pkg}"
-  mkdir -p ${pkg}
-  echo "input" > ${pkg}/in.txt
-  cat > ${pkg}/BUILD <<EOF
-genrule(
-  name = "g",
-  srcs = ["in.txt"],
-  outs = ["out.txt"],
-  cmd = "cp \$< \$@",
-)
-EOF
-
-  bazel build //${pkg}:g \
-    --experimental_working_set=${pkg}/in.txt >$TEST_log 2>&1 \
-    || fail "unexpected failure"
-  expect_log "Focusing on"
-}
-
 function test_correctly_rebuilds_with_working_set_containing_files() {
   local -r pkg=${FUNCNAME[0]}
   mkdir ${pkg}|| fail "cannot mkdir ${pkg}"