Revert: [tool_tests] Remove bringup from Windows tool_tests_commands_2_2 by flutteractionsbot · Pull Request #191793 · flutter/flutter

flutteractionsbot · 2026-08-26T10:04:28Z

Reverts: [tool_tests] Remove bringup from Windows tool_tests_commands_2_2

Initiated by: @cbracken

Reason for reverting: Windows_mokey flavors_test_win flavors_test lit the tree on fire

Original PR Author: @bkonyi

Reviewed By: @jtmcdole

The original PR description is provided below:

Fixes Windows-specific path and test failures in tool_tests_commands subshard 2_2:

Use Glob(entry).matches(relativePath) with POSIX relative paths in project.dart.
Normalize backslashes to POSIX forward slashes in SwiftPackagePackageDependency.format() in swift_packages.dart.
Normalize path separators when encoding workspacePackages dependencies in preview_pubspec_builder.dart.
Consolidate Cache.disableLocking() in upgrade_test.dart setUpAll() and pass missing runInContext overrides.
Guard NDK directory listing with ndkDir.existsSync() in build_aar_test.dart.
Update test expectations and add retry backoff in widget_preview_test.dart, test_test.dart, and regress_176018_test.dart.
Remove bringup: true from Windows tool_tests_commands_2_2 in .ci.yaml.

…2_2 (flutter#191732)" This reverts commit cad9f43.

flutter-dashboard · 2026-08-26T10:05:20Z

Detected the emergency label.

If you add the autosubmit label, the bot will wait until all presubmits pass but ignore the tree status, allowing fixes for tree breakages while still validating that they don't break any existing presubmits.

The "Merge" button is also unlocked. To bypass presubmits as well as the tree status, press the GitHub "Add to Merge Queue".

gemini-code-assist

Code Review

This pull request simplifies path handling, refactors workspace project discovery, and updates various tests in flutter_tools. However, several regressions were identified: reverting path normalization in swift_packages.dart breaks Windows compatibility for Swift generation; removing defensive checks in project.dart and build_aar_test.dart makes the code and tests fragile to missing directories or SDKs; and removing the retry logic in widget_preview_test.dart increases the risk of test flakiness on Windows.

gemini-code-assist · 2026-08-26T10:06:05Z

+        final AndroidSdk androidSdk = globals.androidSdk!;
+        final List<String> installedNdkVersions =
+            androidSdk.directory
+                .childDirectory('ndk')
+                .listSync()
+                .whereType<Directory>()
+                .map((Directory dir) => dir.basename)
+                .where(
+                  (String version) => androidSdk.directory
+                      .childDirectory('ndk')
+                      .childDirectory(version)
+                      .childFile('source.properties')
+                      .existsSync(),
+                )
+                .toList()
+              ..sort();


Reverting the null check on globals.androidSdk and the existence check on the ndk directory makes this test fragile. If the Android SDK is not configured or the NDK directory is missing, this test will crash with a null pointer exception or a FileSystemException when calling listSync(). It is safer to keep these defensive guards.

Suggested change

final AndroidSdk androidSdk = globals.androidSdk!;

final List<String> installedNdkVersions =

androidSdk.directory

.childDirectory('ndk')

.listSync()

.whereType<Directory>()

.map((Directory dir) => dir.basename)

.where(

(String version) => androidSdk.directory

.childDirectory('ndk')

.childDirectory(version)

.childFile('source.properties')

.existsSync(),

)

.toList()

..sort();

final AndroidSdk? androidSdk = globals.androidSdk;

if (androidSdk == null) {

return;

}

final Directory ndkDir = androidSdk.directory.childDirectory('ndk');

final List<String> installedNdkVersions = ndkDir.existsSync()

? ndkDir

.listSync()

.whereType<Directory>()

.map((Directory dir) => dir.basename)

.where(

(String version) =>

ndkDir.childDirectory(version).childFile('source.properties').existsSync(),

)

.toList()

: <String>[];

installedNdkVersions.sort();

References

Check for potential regressions: Look for changes that might break existing functionality or introduce unexpected behavior in related areas. ^(link)

gemini-code-assist · 2026-08-26T10:06:05Z

-    if (!directory.existsSync()) {
-      return;
-    }
    for (final String entry in manifest.workspace) {


Reverting the directory.existsSync() check can lead to unhandled FileSystemExceptions if the directory does not exist when updating workspace projects. Keeping this guard ensures defensive programming and robustness.

Suggested change

for (final String entry in manifest.workspace) {

if (!directory.existsSync()) {

return;

}

for (final String entry in manifest.workspace) {

References

Check for potential regressions: Look for changes that might break existing functionality or introduce unexpected behavior in related areas. ^(link)

gemini-code-assist · 2026-08-26T10:06:05Z

-        delay *= 2;
-      }
-    }
+    await runWidgetPreviewCommand(<String>['clean', rootProject.path]);


Reverting the retry logic with exponential backoff makes this test highly susceptible to flakiness on Windows due to file locking issues (where a process or antivirus still holds a handle to a file in .widget_preview when clean is called). It is highly recommended to keep the retry loop to ensure test stability.

var retries = 5; var delay = const Duration(milliseconds: 100); while (true) { try { await runWidgetPreviewCommand(<String>['clean', rootProject.path]); break; } on Exception catch (_) { retries--; if (retries <= 0) { rethrow; } await Future<void>.delayed(delay); delay *= 2; } }

References

Check for potential regressions: Look for changes that might break existing functionality or introduce unexpected behavior in related areas. ^(link)

gemini-code-assist · 2026-08-26T10:06:05Z

    // ],
-    final String posixPath = path.replaceAll(r'\', '/');
-    return '.package(name: "$name", path: "$posixPath")';
+    return '.package(name: "$name", path: "$path")';


Reverting the path normalization back to using raw Windows backslashes will generate invalid Swift code when run on Windows (e.g., during tests), because backslashes are treated as escape characters in Swift string literals. Normalizing the path to use POSIX forward slashes is necessary for cross-platform compatibility.

final String posixPath = path.replaceAll(r'\', '/'); return '.package(name: "$name", path: "$posixPath")';

References

Check for potential regressions: Look for changes that might break existing functionality or introduce unexpected behavior in related areas. ^(link)

Roll Flutter from 15d8908addf6 to e8dca90ec9e0 (58 revisions) flutter/flutter@15d8908...e8dca90 2026-08-27 [email protected] Terminate existing process before launching with devicectl (flutter/flutter#191885) 2026-08-27 [email protected] Roll Fuchsia Linux SDK from qjOQi-zAgu_tADorh... to dDxH8G5cDBP602eyG... (flutter/flutter#191889) 2026-08-27 [email protected] [flutter_tools] Verify native assets tree-shaking during linking (flutter/flutter#191637) 2026-08-27 [email protected] Denylists b-series powervr from vulkan (flutter/flutter#191808) 2026-08-27 [email protected] Handle linear and radial gradients in UberSDF (flutter/flutter#190874) 2026-08-27 [email protected] Roll Packages from 740f093 to bd3cbc1 (7 revisions) (flutter/flutter#191886) 2026-08-27 [email protected] Disable more Windows tests that have been causing CI flakes (flutter/flutter#191822) 2026-08-27 [email protected] Roll Skia from d32721369bd8 to 82e972ea84b1 (2 revisions) (flutter/flutter#191880) 2026-08-27 [email protected] Roll Skia from 3640b8edd16c to d32721369bd8 (10 revisions) (flutter/flutter#191858) 2026-08-27 [email protected] Revert: [AGP 9] Update remaining tests to AGP 9 (flutter/flutter#191863) 2026-08-27 [email protected] Roll Fuchsia Test Scripts from 0iCv10IlKfiilEBOU... to 6SXRz6wsA2Zm_rAqP... (flutter/flutter#191852) 2026-08-27 [email protected] Roll pub packages (flutter/flutter#191851) 2026-08-27 [email protected] Refactor FormField build wrappers (flutter/flutter#185795) 2026-08-27 [email protected] Make ScrollPhysics reactive by introducing shouldUpdate (flutter/flutter#189664) 2026-08-27 [email protected] macOS: Fix crash on out-of-bounds text input ranges (flutter/flutter#191780) 2026-08-27 [email protected] Add HCPP feature flag, and turn it on by default in beta/master (flutter/flutter#190623) 2026-08-27 [email protected] [tool] Migrate CleanCommand to modular dependency injection (flutter/flutter#190742) 2026-08-26 [email protected] Update triage docs for ecosystem and codelab changes (flutter/flutter#191809) 2026-08-26 [email protected] [AGP 9] Update remaining tests to AGP 9 (flutter/flutter#191824) 2026-08-26 [email protected] [UIScene] Migrate dev/benchmarks/complex_layout to UIScene lifecycle (flutter/flutter#191619) 2026-08-26 [email protected] Add SliverAppBar showOnScreen semantics test coverage (flutter/flutter#190410) 2026-08-26 [email protected] Add prompt_suggestion icon to list of RTL mirroring icons. (flutter/flutter#191741) 2026-08-26 [email protected] Remove bringup for batch 3 (flutter/flutter#191750) 2026-08-26 [email protected] Roll Skia from b5465d7b0b77 to 3640b8edd16c (6 revisions) (flutter/flutter#191835) 2026-08-26 [email protected] Uiscene migrate custom channels views (flutter/flutter#191817) 2026-08-26 [email protected] Support --[no-]adb-log-filtering CLI option (flutter/flutter#187252) 2026-08-26 [email protected] Roll Dart SDK from cb8a4e1a0fbb to cb4c39d067f3 (2 revisions) (flutter/flutter#191825) 2026-08-26 [email protected] Fix `Navigator.pushNamed<T>()` type checking (flutter/flutter#188148) 2026-08-26 [email protected] Handle the case where a window doesn't have a title set (flutter/flutter#191767) 2026-08-26 [email protected] [Android] Remove old `InputType` constructor from embedding (flutter/flutter#191244) 2026-08-26 [email protected] Roll Skia from 244a6a0f8f92 to b5465d7b0b77 (19 revisions) (flutter/flutter#191810) 2026-08-26 [email protected] Tolerate floating-point rounding in paintImage centerSlice assertion (flutter/flutter#185789) 2026-08-26 [email protected] Fixes translated bounded blurs (flutter/flutter#191615) 2026-08-26 [email protected] Roll Fuchsia Linux SDK from MstTWE1RDOT-RnrtH... to qjOQi-zAgu_tADorh... (flutter/flutter#191769) 2026-08-26 [email protected] Lerp HSVColor and HSLColor hue along the shortest arc (flutter/flutter#191186) 2026-08-26 [email protected] Fix enum instances comparison to use `equality ==` since dart has the correct behavior now (flutter/flutter#191537) 2026-08-26 [email protected] Switches windows to opengles 3 (flutter/flutter#191516) 2026-08-26 [email protected] Roll Dart SDK from 7739e8602bc1 to cb8a4e1a0fbb (1 revision) (flutter/flutter#191784) 2026-08-26 [email protected] iOS,macOS: Check viewType before creating a platform view (flutter/flutter#191777) 2026-08-26 [email protected] Revert: [tool_tests] Remove bringup from Windows tool_tests_commands_2_2 (flutter/flutter#191793) 2026-08-26 [email protected] refactor(flutter_tools): clean up dead unreferenced declarations (flutter/flutter#191163) 2026-08-26 [email protected] Roll Fuchsia GN SDK from a87CbQSWEjkPUK1ZY... to ZsxUUK2SfA-TrNvb8... (flutter/flutter#191763) 2026-08-26 [email protected] [tool_tests] Remove bringup from Windows tool_tests_commands_2_2 (flutter/flutter#191732) 2026-08-25 [email protected] Remove legacy gen_defaults analyze checks (flutter/flutter#191629) 2026-08-25 [email protected] Refactors `try` to avoid `unawaited_return_in_try_block` case (flutter/flutter#191129) 2026-08-25 [email protected] Roll Dart SDK from 8996935d3d0a to 7739e8602bc1 (1 revision) (flutter/flutter#191754) ...

…r#12660) Roll Flutter from 15d8908addf6 to e8dca90ec9e0 (58 revisions) flutter/flutter@15d8908...e8dca90 2026-08-27 [email protected] Terminate existing process before launching with devicectl (flutter/flutter#191885) 2026-08-27 [email protected] Roll Fuchsia Linux SDK from qjOQi-zAgu_tADorh... to dDxH8G5cDBP602eyG... (flutter/flutter#191889) 2026-08-27 [email protected] [flutter_tools] Verify native assets tree-shaking during linking (flutter/flutter#191637) 2026-08-27 [email protected] Denylists b-series powervr from vulkan (flutter/flutter#191808) 2026-08-27 [email protected] Handle linear and radial gradients in UberSDF (flutter/flutter#190874) 2026-08-27 [email protected] Roll Packages from 740f093 to bd3cbc1 (7 revisions) (flutter/flutter#191886) 2026-08-27 [email protected] Disable more Windows tests that have been causing CI flakes (flutter/flutter#191822) 2026-08-27 [email protected] Roll Skia from d32721369bd8 to 82e972ea84b1 (2 revisions) (flutter/flutter#191880) 2026-08-27 [email protected] Roll Skia from 3640b8edd16c to d32721369bd8 (10 revisions) (flutter/flutter#191858) 2026-08-27 [email protected] Revert: [AGP 9] Update remaining tests to AGP 9 (flutter/flutter#191863) 2026-08-27 [email protected] Roll Fuchsia Test Scripts from 0iCv10IlKfiilEBOU... to 6SXRz6wsA2Zm_rAqP... (flutter/flutter#191852) 2026-08-27 [email protected] Roll pub packages (flutter/flutter#191851) 2026-08-27 [email protected] Refactor FormField build wrappers (flutter/flutter#185795) 2026-08-27 [email protected] Make ScrollPhysics reactive by introducing shouldUpdate (flutter/flutter#189664) 2026-08-27 [email protected] macOS: Fix crash on out-of-bounds text input ranges (flutter/flutter#191780) 2026-08-27 [email protected] Add HCPP feature flag, and turn it on by default in beta/master (flutter/flutter#190623) 2026-08-27 [email protected] [tool] Migrate CleanCommand to modular dependency injection (flutter/flutter#190742) 2026-08-26 [email protected] Update triage docs for ecosystem and codelab changes (flutter/flutter#191809) 2026-08-26 [email protected] [AGP 9] Update remaining tests to AGP 9 (flutter/flutter#191824) 2026-08-26 [email protected] [UIScene] Migrate dev/benchmarks/complex_layout to UIScene lifecycle (flutter/flutter#191619) 2026-08-26 [email protected] Add SliverAppBar showOnScreen semantics test coverage (flutter/flutter#190410) 2026-08-26 [email protected] Add prompt_suggestion icon to list of RTL mirroring icons. (flutter/flutter#191741) 2026-08-26 [email protected] Remove bringup for batch 3 (flutter/flutter#191750) 2026-08-26 [email protected] Roll Skia from b5465d7b0b77 to 3640b8edd16c (6 revisions) (flutter/flutter#191835) 2026-08-26 [email protected] Uiscene migrate custom channels views (flutter/flutter#191817) 2026-08-26 [email protected] Support --[no-]adb-log-filtering CLI option (flutter/flutter#187252) 2026-08-26 [email protected] Roll Dart SDK from cb8a4e1a0fbb to cb4c39d067f3 (2 revisions) (flutter/flutter#191825) 2026-08-26 [email protected] Fix `Navigator.pushNamed<T>()` type checking (flutter/flutter#188148) 2026-08-26 [email protected] Handle the case where a window doesn't have a title set (flutter/flutter#191767) 2026-08-26 [email protected] [Android] Remove old `InputType` constructor from embedding (flutter/flutter#191244) 2026-08-26 [email protected] Roll Skia from 244a6a0f8f92 to b5465d7b0b77 (19 revisions) (flutter/flutter#191810) 2026-08-26 [email protected] Tolerate floating-point rounding in paintImage centerSlice assertion (flutter/flutter#185789) 2026-08-26 [email protected] Fixes translated bounded blurs (flutter/flutter#191615) 2026-08-26 [email protected] Roll Fuchsia Linux SDK from MstTWE1RDOT-RnrtH... to qjOQi-zAgu_tADorh... (flutter/flutter#191769) 2026-08-26 [email protected] Lerp HSVColor and HSLColor hue along the shortest arc (flutter/flutter#191186) 2026-08-26 [email protected] Fix enum instances comparison to use `equality ==` since dart has the correct behavior now (flutter/flutter#191537) 2026-08-26 [email protected] Switches windows to opengles 3 (flutter/flutter#191516) 2026-08-26 [email protected] Roll Dart SDK from 7739e8602bc1 to cb8a4e1a0fbb (1 revision) (flutter/flutter#191784) 2026-08-26 [email protected] iOS,macOS: Check viewType before creating a platform view (flutter/flutter#191777) 2026-08-26 [email protected] Revert: [tool_tests] Remove bringup from Windows tool_tests_commands_2_2 (flutter/flutter#191793) 2026-08-26 [email protected] refactor(flutter_tools): clean up dead unreferenced declarations (flutter/flutter#191163) 2026-08-26 [email protected] Roll Fuchsia GN SDK from a87CbQSWEjkPUK1ZY... to ZsxUUK2SfA-TrNvb8... (flutter/flutter#191763) 2026-08-26 [email protected] [tool_tests] Remove bringup from Windows tool_tests_commands_2_2 (flutter/flutter#191732) 2026-08-25 [email protected] Remove legacy gen_defaults analyze checks (flutter/flutter#191629) 2026-08-25 [email protected] Refactors `try` to avoid `unawaited_return_in_try_block` case (flutter/flutter#191129) 2026-08-25 [email protected] Roll Dart SDK from 8996935d3d0a to 7739e8602bc1 (1 revision) (flutter/flutter#191754) ...

Revert "[tool_tests] Remove bringup from Windows tool_tests_commands_…

184b6a7

…2_2 (flutter#191732)" This reverts commit cad9f43.

flutteractionsbot requested review from a team as code owners August 26, 2026 10:04

flutter-dashboard Bot added the CICD Run CI/CD label Aug 26, 2026

flutteractionsbot mentioned this pull request Aug 26, 2026

[tool_tests] Remove bringup from Windows tool_tests_commands_2_2 #191732

Merged

github-actions Bot added tool Affects the "flutter" command-line tool. See also t: labels. platform-macos Building on or for macOS specifically a: desktop Running on desktop team-ios Owned by iOS platform team team-macos Owned by the macOS platform team labels Aug 26, 2026

cbracken added the emergency Jump the queue; land PR in front of all others; only use for emergencies label Aug 26, 2026

cbracken approved these changes Aug 26, 2026

View reviewed changes

cbracken enabled auto-merge August 26, 2026 10:05

cbracken added this pull request to the merge queue Aug 26, 2026

gemini-code-assist Bot reviewed Aug 26, 2026

View reviewed changes

Merged via the queue into flutter:master with commit e62a247 Aug 26, 2026
27 of 28 checks passed

flutteractionsbot deleted the revert-191732-1787738662 branch August 26, 2026 11:56

Navigation Menu

Repository navigation

Revert: [tool_tests] Remove bringup from Windows tool_tests_commands_2_2 - #191793

Revert: [tool_tests] Remove bringup from Windows tool_tests_commands_2_2#191793
cbracken merged 1 commit into
flutter:masterfrom
flutteractionsbot:revert-191732-1787738662

flutteractionsbot commented Aug 26, 2026

Uh oh!

flutter-dashboard Bot commented Aug 26, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

gemini-code-assist Bot Aug 26, 2026

Uh oh!

gemini-code-assist Bot Aug 26, 2026

Uh oh!

gemini-code-assist Bot Aug 26, 2026

Uh oh!

gemini-code-assist Bot Aug 26, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

flutteractionsbot commented Aug 26, 2026

Uh oh!

flutter-dashboard Bot commented Aug 26, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Aug 26, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Aug 26, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Aug 26, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Aug 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants