[tools,pigeon] Update tooling to handle Windows build output changes

packages/pigeon/tool/shared/test_suites.dart

@@ -4,6 +4,7 @@
 
 // ignore_for_file: avoid_print
 
+import 'dart:ffi';
 import 'dart:io' show File, Directory;
 
 import 'package:meta/meta.dart';
@@ -313,9 +314,23 @@ Future<int> _runWindowsUnitTests() async {
     return compileCode;
   }
 
-  return runProcess(
-      '$examplePath/build/windows/plugins/test_plugin/Debug/test_plugin_test.exe',
-      <String>[]);
+  // Depending on the Flutter version, the build output path is different.
+  // Check for the new location first, and fall back to the old location, to
+  // support running against both stable and master.
+  // TODO(stuartmorgan): Remove all this when these tests no longer need to
+  // support Flutter 3.13, and just construct the version of the path with the
+  // architecture.
+  const String buildDirBase = '$examplePath/build/windows';
+  const String buildRelativeBinaryPath =
+      'plugins/test_plugin/Debug/test_plugin_test.exe';
+  final String arch = Abi.current() == Abi.windowsArm64 ? 'arm64' : 'x64';
+  final String newPath = '$buildDirBase/$arch/$buildRelativeBinaryPath';
+  const String oldPath = '$buildDirBase/$buildRelativeBinaryPath';
+  if (File(newPath).existsSync()) {
+    return runProcess(newPath, <String>[]);
+  } else {
+    return runProcess(oldPath, <String>[]);
+  }
 }
 
 Future<int> _runWindowsIntegrationTests() async {

script/tool/lib/src/common/cmake.dart

@@ -20,6 +20,7 @@ class CMakeProject {
     required this.buildMode,
     this.processRunner = const ProcessRunner(),
     this.platform = const LocalPlatform(),
+    this.arch,
   });
 
   /// The directory of a Flutter project to run Gradle commands in.
@@ -31,6 +32,11 @@ class CMakeProject {
   /// The platform that commands are being run on.
   final Platform platform;
 
+  /// The architecture subdirectory of the build.
+  // TODO(stuartmorgan): Make this non-nullable once Flutter 3.13 is no longer
+  // supported, since at that point there will always be a subdirectory.
+  final String? arch;
+
   /// The build mode (e.g., Debug, Release).
   ///
   /// This is a constructor paramater because on Linux many properties depend
@@ -46,14 +52,13 @@ class CMakeProject {
   Directory get buildDirectory {
     Directory buildDir =
         flutterProject.childDirectory('build').childDirectory(_platformDirName);
+    if (arch != null) {
+      buildDir = buildDir.childDirectory(arch!);
+    }
     if (platform.isLinux) {
-      buildDir = buildDir
-          // TODO(stuartmorgan): Support arm64 if that ever becomes a supported
-          // CI configuration for the repository.
-          .childDirectory('x64')
-          // Linux uses a single-config generator, so the base build directory
-          // includes the configuration.
-          .childDirectory(buildMode.toLowerCase());
+      // Linux uses a single-config generator, so the base build directory
+      // includes the configuration.
+      buildDir = buildDir.childDirectory(buildMode.toLowerCase());
     }
     return buildDir;
   }

script/tool/lib/src/native_test_command.dart

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:ffi';
+
 import 'package:file/file.dart';
 import 'package:meta/meta.dart';
 
@@ -41,7 +43,9 @@ class NativeTestCommand extends PackageLoopingCommand {
     super.packagesDir, {
     super.processRunner,
     super.platform,
-  }) : _xcode = Xcode(processRunner: processRunner, log: true) {
+    Abi? abi,
+  })  : _abi = abi ?? Abi.current(),
+        _xcode = Xcode(processRunner: processRunner, log: true) {
     argParser.addOption(
       _iOSDestinationFlag,
       help: 'Specify the destination when running iOS tests.\n'
@@ -63,6 +67,9 @@ class NativeTestCommand extends PackageLoopingCommand {
         help: 'Runs native integration (UI) tests', defaultsTo: true);
   }
 
+  // The ABI of the host.
+  final Abi _abi;
+
   // The device destination flags for iOS tests.
   List<String> _iOSDestinationFlags = <String>[];
 
@@ -548,9 +555,10 @@ this command.
         isTestBinary: isTestBinary);
   }
 
-  /// Finds every file in the [buildDirectoryName] subdirectory of [plugin]'s
-  /// build directory for which [isTestBinary] is true, and runs all of them,
-  /// returning the overall result.
+  /// Finds every file in the relevant (based on [platformName], [buildMode],
+  /// and [arch]) subdirectory of [plugin]'s build directory for which
+  /// [isTestBinary] is true, and runs all of them, returning the overall
+  /// result.
   ///
   /// The binaries are assumed to be Google Test test binaries, thus returning
   /// zero for success and non-zero for failure.
@@ -563,11 +571,30 @@ this command.
     final List<File> testBinaries = <File>[];
     bool hasMissingBuild = false;
     bool buildFailed = false;
+    String? arch;
+    if (platform.isWindows) {
+      arch = _abi == Abi.windowsX64 ? 'x64' : 'arm64';
+    } else if (platform.isLinux) {
+      // TODO(stuartmorgan): Support arm64 if that ever becomes a supported
+      // CI configuration for the repository.
+      arch = 'x64';
+    }
     for (final RepositoryPackage example in plugin.getExamples()) {
-      final CMakeProject project = CMakeProject(example.directory,
+      CMakeProject project = CMakeProject(example.directory,
           buildMode: buildMode,
           processRunner: processRunner,
-          platform: platform);
+          platform: platform,
+          arch: arch);
+      if (platform.isWindows && !project.isConfigured()) {
+        // Check again without the arch subdirectory, since 3.13 doesn't
+        // have it yet.
+        // TODO(stuartmorgan): Remove this once Flutter 3.13 is no longer
+        // supported by the main repository CI.
+        project = CMakeProject(example.directory,
+            buildMode: buildMode,
+            processRunner: processRunner,
+            platform: platform);
+      }
       if (!project.isConfigured()) {
         printError('ERROR: Run "flutter build" on ${example.displayName}, '
             'or run this tool\'s "build-examples" command, for the target '