Expand understanding of build targets in et (#51868)

- s/TestTarget/BuildTarget.
- Use a more informative way of querying for build targets from gn
- Port existing code to use new interfaces
- Replace 'query tests' with 'query targets' and a --testonly flag
- Extend 'et build' with support for build target selectors.
- Extend 'et query targets' with support for build target selectors.

Author: johnmccutchan

tools/engine_tool/lib/src/commands/build_command.dart

@@ -2,9 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:io';
+
 import 'package:engine_build_configs/engine_build_configs.dart';
+import 'package:path/path.dart' as p;
 
 import '../build_utils.dart';
+import '../gn_utils.dart';
 import 'command.dart';
 import 'flags.dart';
 
@@ -18,7 +22,9 @@ final class BuildCommand extends CommandBase {
     builds = runnableBuilds(environment, configs);
     debugCheckBuilds(builds);
     addConfigOption(
-      environment, argParser, runnableBuilds(environment, configs),
+      environment,
+      argParser,
+      runnableBuilds(environment, configs),
     );
     argParser.addFlag(
       rbeFlag,
@@ -35,7 +41,9 @@ final class BuildCommand extends CommandBase {
   String get name => 'build';
 
   @override
-  String get description => 'Builds the engine';
+  String get description => 'Builds the engine'
+      'et build //flutter/fml/...             # Build all targets in `//flutter/fml/`'
+      'et build //flutter/fml:fml_benchmarks  # Build a specific target in `//flutter/fml/`';
 
   @override
   Future<int> run() async {
@@ -53,6 +61,22 @@ final class BuildCommand extends CommandBase {
       if (!useRbe) '--no-rbe',
     ];
 
-    return runBuild(environment, build, extraGnArgs: extraGnArgs);
+    final Map<String, BuildTarget> allTargets = await findTargets(environment,
+        Directory(p.join(environment.engine.outDir.path, build.ninja.config)));
+    final Set<BuildTarget> selectedTargets =
+        selectTargets(argResults!.rest, allTargets);
+    if (selectedTargets.isEmpty) {
+      environment.logger.error(
+          'No build targets matched ${argResults!.rest}\nRun `et query targets` to see list of targets.');
+      return 1;
+    }
+
+    // Chop off the '//' prefix.
+    final List<String> buildTargets = selectedTargets
+        .map<String>(
+            (BuildTarget target) => target.label.substring('//'.length))
+        .toList();
+    return runBuild(environment, build,
+        extraGnArgs: extraGnArgs, targets: buildTargets);
   }
 }

tools/engine_tool/lib/src/commands/flags.dart

@@ -19,3 +19,4 @@ const String quietFlag = 'quiet';
 const String rbeFlag = 'rbe';
 const String runTestsFlag = 'run-tests';
 const String verboseFlag = 'verbose';
+const String testOnlyFlag = 'testonly';

tools/engine_tool/lib/src/commands/query_command.dart

@@ -48,7 +48,7 @@ final class QueryCommand extends CommandBase {
       environment: environment,
       configs: configs,
     ));
-    addSubcommand(QueryTestsCommand(
+    addSubcommand(QueryTargetsCommand(
       environment: environment,
       configs: configs,
     ));
@@ -131,17 +131,25 @@ final class QueryBuildersCommand extends CommandBase {
   }
 }
 
-/// The query tests command.
-final class QueryTestsCommand extends CommandBase {
-  /// Constructs the 'query tests' command.
-  QueryTestsCommand({
+/// The query targets command.
+final class QueryTargetsCommand extends CommandBase {
+  /// Constructs the 'query targets' command.
+  QueryTargetsCommand({
     required super.environment,
     required this.configs,
   }) {
     builds = runnableBuilds(environment, configs);
     debugCheckBuilds(builds);
     addConfigOption(
-      environment, argParser, runnableBuilds(environment, configs),
+      environment,
+      argParser,
+      runnableBuilds(environment, configs),
+    );
+    argParser.addFlag(
+      testOnlyFlag,
+      abbr: 't',
+      help: 'Filter build targets to only include tests',
+      negatable: false,
     );
   }
 
@@ -152,24 +160,38 @@ final class QueryTestsCommand extends CommandBase {
   late final List<Build> builds;
 
   @override
-  String get name => 'tests';
+  String get name => 'targets';
 
   @override
-  String get description => 'Provides information about test targets';
+  String get description => 'Provides information about build targets'
+      'et query targets --testonly         # List only test targets'
+      'et query targets //flutter/fml/...  # List all targets under `//flutter/fml`';
 
   @override
   Future<int> run() async {
     final String configName = argResults![configFlag] as String;
+    final bool testOnly = argResults![testOnlyFlag] as bool;
     final String demangledName = demangleConfigName(environment, configName);
     final Build? build =
         builds.where((Build build) => build.name == demangledName).firstOrNull;
     if (build == null) {
       environment.logger.error('Could not find config $configName');
       return 1;
     }
-    final Map<String, TestTarget> targets = await findTestTargets(environment,
+    final Map<String, BuildTarget> allTargets = await findTargets(environment,
         Directory(p.join(environment.engine.outDir.path, build.ninja.config)));
-    for (final TestTarget target in targets.values) {
+    final Set<BuildTarget> selectedTargets =
+        selectTargets(argResults!.rest, allTargets);
+    if (selectedTargets.isEmpty) {
+      environment.logger.error(
+          'No build targets matched ${argResults!.rest}\nRun `et query targets` to see list of targets.');
+      return 1;
+    }
+    for (final BuildTarget target in selectedTargets) {
+      if (testOnly &&
+          (!target.testOnly || target.type != BuildTargetType.executable)) {
+        continue;
+      }
       environment.logger.status(target.label);
     }
     return 0;

tools/engine_tool/lib/src/commands/test_command.dart

@@ -24,7 +24,9 @@ final class TestCommand extends CommandBase {
     builds = runnableBuilds(environment, configs);
     debugCheckBuilds(builds);
     addConfigOption(
-      environment, argParser, runnableBuilds(environment, configs),
+      environment,
+      argParser,
+      runnableBuilds(environment, configs),
     );
   }
 
@@ -50,19 +52,29 @@ final class TestCommand extends CommandBase {
       return 1;
     }
 
-    final Map<String, TestTarget> allTargets = await findTestTargets(
-        environment,
+    final Map<String, BuildTarget> allTargets = await findTargets(environment,
         Directory(p.join(environment.engine.outDir.path, build.ninja.config)));
-    final Set<TestTarget> selectedTargets =
+    final Set<BuildTarget> selectedTargets =
         selectTargets(argResults!.rest, allTargets);
     if (selectedTargets.isEmpty) {
       environment.logger.error(
-          'No build targets matched ${argResults!.rest}\nRun `et query tests` to see list of targets.');
+          'No build targets matched ${argResults!.rest}\nRun `et query targets --testonly` to see list of targets.');
       return 1;
     }
+    for (final BuildTarget target in selectedTargets) {
+      if (!target.testOnly || target.type != BuildTargetType.executable) {
+        // Remove any targets that aren't testOnly and aren't executable.
+        selectedTargets.remove(target);
+      }
+      if (target.executable == null) {
+        environment.logger.fatal(
+            '$target is an executable but is missing the executable path');
+      }
+    }
     // Chop off the '//' prefix.
     final List<String> buildTargets = selectedTargets
-        .map<String>((TestTarget target) => target.label.substring('//'.length))
+        .map<String>(
+            (BuildTarget target) => target.label.substring('//'.length))
         .toList();
     // TODO(johnmccutchan): runBuild manipulates buildTargets and adds some
     // targets listed in Build. Fix this.
@@ -74,8 +86,8 @@ final class TestCommand extends CommandBase {
     final WorkerPool workerPool =
         WorkerPool(environment, ProcessTaskProgressReporter(environment));
     final Set<ProcessTask> tasks = <ProcessTask>{};
-    for (final TestTarget target in selectedTargets) {
-      final List<String> commandLine = <String>[target.executable.path];
+    for (final BuildTarget target in selectedTargets) {
+      final List<String> commandLine = <String>[target.executable!.path];
       tasks.add(ProcessTask(
           target.label, environment, environment.engine.srcDir, commandLine));
     }