coderabbit-test
diff --git a/‎src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
Lines changed: 45 additions & 9 deletions b/‎src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
Lines changed: 45 additions & 9 deletions
diff --git a/‎src/test/java/com/google/devtools/build/lib/buildtool/util/BuildIntegrationTestCase.java
Lines changed: 2 additions & 3 deletions b/‎src/test/java/com/google/devtools/build/lib/buildtool/util/BuildIntegrationTestCase.java
Lines changed: 2 additions & 3 deletions
@@ -76,6 +76,7 @@
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParser;
 import com.google.devtools.common.options.OptionsParsingException;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.protobuf.Any;
 import com.google.protobuf.Message;
 import java.util.ArrayList;
@@ -172,19 +173,25 @@ public final CommandEnvironment newCommand(Class<? extends BlazeCommand> command
 
   /**
    * Creates a new command environment with additional proto extensions as if they were passed to
-   * the blaze server.
+   * the Blaze server.
+   *
+   * @param command the command instance for which to create a new environment.
+   * @param extensions additional proto extensions to pass to the command.
+   * @return the new command environment.
    */
-  public final CommandEnvironment newCommandWithExtensions(
-      Class<? extends BlazeCommand> command, List<Message> extensions) throws Exception {
+  @CanIgnoreReturnValue
+  public final CommandEnvironment newCustomCommandWithExtensions(
+      BlazeCommand command, List<Message> extensions) throws Exception {
     Command commandAnnotation =
         checkNotNull(
-            command.getAnnotation(Command.class),
+            command.getClass().getAnnotation(Command.class),
             "BlazeCommand %s missing command annotation",
-            command);
-    this.command = command.getDeclaredConstructor().newInstance();
+            command.getClass());
+    this.command = command;
+
     additionalOptionsClasses.addAll(
         BlazeCommandUtils.getOptions(
-            command, runtime.getBlazeModules(), runtime.getRuleClassProvider()));
+            command.getClass(), runtime.getBlazeModules(), runtime.getRuleClassProvider()));
     initializeOptionsParser(commandAnnotation);
 
     checkNotNull(
@@ -211,6 +218,22 @@ public final CommandEnvironment newCommandWithExtensions(
     return env;
   }
 
+  /**
+   * Creates a new command environment with additional proto extensions as if they were passed to
+   * the Blaze server. This method creates a new instance of the provided command class via its
+   * default constructor. For command classes with constructor parameters, use {@link
+   * #newCustomCommandWithExtensions} and pass in a pre-existing {@link BlazeCommand} instance.
+   *
+   * @param command the command class for which to create a new environment. This class must have a
+   *     default constructor or this method will throw an exception.
+   * @param extensions additional proto extensions to pass to the command.
+   */
+  public final CommandEnvironment newCommandWithExtensions(
+      Class<? extends BlazeCommand> command, List<Message> extensions) throws Exception {
+    return newCustomCommandWithExtensions(
+        command.getDeclaredConstructor().newInstance(), extensions);
+  }
+
   /**
    * Returns the command environment. You must call {@link #newCommand()} before calling this
    * method.
@@ -236,6 +259,14 @@ public void addOptions(List<String> args) {
     optionsToParse.addAll(args);
   }
 
+  public void setOptionsParserResidue(List<String> residue, List<String> postDoubleDashResidue) {
+    optionsParser.setResidue(residue, postDoubleDashResidue);
+  }
+
+  public void setConfiguration(BuildConfigurationValue configuration) {
+    this.configuration = configuration;
+  }
+
   public void addStarlarkOption(String label, Object value) {
     starlarkOptions.put(Label.parseCanonicalUnchecked(label).getCanonicalForm(), value);
   }
@@ -319,10 +350,10 @@ private OptionsParser createOptionsParser(Command commandAnnotation) {
     return OptionsParser.builder().optionsClasses(options).ignoreUserOptions().build();
   }
 
-  void executeNonBuildCommand() throws Exception {
+  public void executeCustomCommand() throws Exception {
     checkNotNull(command, "No command created, try calling newCommand()");
     checkState(
+        env.getCommand().buildPhase() == NONE || env.getCommandName().equals("run"),
         "%s is a build command, did you mean to call executeBuild()?",
         env.getCommandName());
 
@@ -337,6 +368,11 @@ void executeNonBuildCommand() throws Exception {
       try {
         Crash crash = null;
         try {
+          if (env.getCommandName().equals("run")) {
+            try (SilentCloseable c = Profiler.instance().profile("syncPackageLoading")) {
+              env.syncPackageLoading(optionsParser);
+            }
+          }
           result = command.exec(env, optionsParser);
         } catch (RuntimeException | Error e) {
           crash = Crash.from(e);
 
@@ -65,7 +65,6 @@
 import com.google.devtools.build.lib.bugreport.CrashContext;
 import com.google.devtools.build.lib.buildtool.BuildRequest;
 import com.google.devtools.build.lib.buildtool.BuildResult;
-import com.google.devtools.build.lib.buildtool.BuildTool;
 import com.google.devtools.build.lib.buildtool.buildevent.BuildStartingEvent;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
@@ -861,14 +860,14 @@ public final BuildResult buildTarget(List<String> targets) throws Exception {
   protected void info() throws Exception {
     events.setOutErr(outErr);
     runtimeWrapper.newCommand(InfoCommand.class);
-    runtimeWrapper.executeNonBuildCommand();
+    runtimeWrapper.executeCustomCommand();
   }
 
   /** Runs the {@code clean} command. */
   public void clean() throws Exception {
     events.setOutErr(outErr);
     runtimeWrapper.newCommand(CleanCommand.class);
-    runtimeWrapper.executeNonBuildCommand();
+    runtimeWrapper.executeCustomCommand();
   }
 
   /** Utility function: parse a string as a label. */