Reconcile flutter_tools tests with upstream 3.44.1#157
Merged
Conversation
The 3.44.1 rebase bumped source to upstream but left several tool test files on the old (~3.41) base and dropped the test-side of shorebird's own source divergences, so `tool_tests/general` was red on shorebird/dev (and on every PR into it). Reconcile the affected test files with the current source in this checkout (3-way merge of shorebird's changes onto 3.44.1 where applicable, plus expectation updates to match what the source actually emits): - macos_test.dart: pick up upstream's getInfo `buildDirectory` param + new imports; align iOS gen_snapshot to the assembly→cc/clang→strip flow this fork uses (not upstream's macho-dylib path). - common_test.dart / android_test.dart: expect `--strip` (shorebird strip-by-default, build.dart) on AOT ELF gen_snapshot invocations. - cache_test.dart: match the displayName/downloadCount artifact API (FakeSecondaryCachedArtifact gains the missing overrides) and the "Web SDK"/"Engine Information" download-status messages. Tests only; no lib/ changes, nothing skipped. All four files pass locally (macos 21, common 22, android 13, cache 58 + 2 pre-existing skips).
bdero
approved these changes
Jun 5, 2026
mrnpro
pushed a commit
to Flutter-Code-Push/flutter
that referenced
this pull request
Jun 16, 2026
The 3.44.1 rebase bumped source to upstream but left several tool test files on the old (~3.41) base and dropped the test-side of shorebird's own source divergences, so `tool_tests/general` was red on shorebird/dev (and on every PR into it). Reconcile the affected test files with the current source in this checkout (3-way merge of shorebird's changes onto 3.44.1 where applicable, plus expectation updates to match what the source actually emits): - macos_test.dart: pick up upstream's getInfo `buildDirectory` param + new imports; align iOS gen_snapshot to the assembly→cc/clang→strip flow this fork uses (not upstream's macho-dylib path). - common_test.dart / android_test.dart: expect `--strip` (shorebird strip-by-default, build.dart) on AOT ELF gen_snapshot invocations. - cache_test.dart: match the displayName/downloadCount artifact API (FakeSecondaryCachedArtifact gains the missing overrides) and the "Web SDK"/"Engine Information" download-status messages. Tests only; no lib/ changes, nothing skipped. All four files pass locally (macos 21, common 22, android 13, cache 58 + 2 pre-existing skips).
bdero
pushed a commit
that referenced
this pull request
Jun 22, 2026
The 3.44.1 rebase bumped source to upstream but left several tool test files on the old (~3.41) base and dropped the test-side of shorebird's own source divergences, so `tool_tests/general` was red on shorebird/dev (and on every PR into it). Reconcile the affected test files with the current source in this checkout (3-way merge of shorebird's changes onto 3.44.1 where applicable, plus expectation updates to match what the source actually emits): - macos_test.dart: pick up upstream's getInfo `buildDirectory` param + new imports; align iOS gen_snapshot to the assembly→cc/clang→strip flow this fork uses (not upstream's macho-dylib path). - common_test.dart / android_test.dart: expect `--strip` (shorebird strip-by-default, build.dart) on AOT ELF gen_snapshot invocations. - cache_test.dart: match the displayName/downloadCount artifact API (FakeSecondaryCachedArtifact gains the missing overrides) and the "Web SDK"/"Engine Information" download-status messages. Tests only; no lib/ changes, nothing skipped. All four files pass locally (macos 21, common 22, android 13, cache 58 + 2 pre-existing skips).
bdero
pushed a commit
that referenced
this pull request
Jun 25, 2026
The 3.44.1 rebase bumped source to upstream but left several tool test files on the old (~3.41) base and dropped the test-side of shorebird's own source divergences, so `tool_tests/general` was red on shorebird/dev (and on every PR into it). Reconcile the affected test files with the current source in this checkout (3-way merge of shorebird's changes onto 3.44.1 where applicable, plus expectation updates to match what the source actually emits): - macos_test.dart: pick up upstream's getInfo `buildDirectory` param + new imports; align iOS gen_snapshot to the assembly→cc/clang→strip flow this fork uses (not upstream's macho-dylib path). - common_test.dart / android_test.dart: expect `--strip` (shorebird strip-by-default, build.dart) on AOT ELF gen_snapshot invocations. - cache_test.dart: match the displayName/downloadCount artifact API (FakeSecondaryCachedArtifact gains the missing overrides) and the "Web SDK"/"Engine Information" download-status messages. Tests only; no lib/ changes, nothing skipped. All four files pass locally (macos 21, common 22, android 13, cache 58 + 2 pre-existing skips).
bdero
pushed a commit
that referenced
this pull request
Jul 7, 2026
The 3.44.1 rebase bumped source to upstream but left several tool test files on the old (~3.41) base and dropped the test-side of shorebird's own source divergences, so `tool_tests/general` was red on shorebird/dev (and on every PR into it). Reconcile the affected test files with the current source in this checkout (3-way merge of shorebird's changes onto 3.44.1 where applicable, plus expectation updates to match what the source actually emits): - macos_test.dart: pick up upstream's getInfo `buildDirectory` param + new imports; align iOS gen_snapshot to the assembly→cc/clang→strip flow this fork uses (not upstream's macho-dylib path). - common_test.dart / android_test.dart: expect `--strip` (shorebird strip-by-default, build.dart) on AOT ELF gen_snapshot invocations. - cache_test.dart: match the displayName/downloadCount artifact API (FakeSecondaryCachedArtifact gains the missing overrides) and the "Web SDK"/"Engine Information" download-status messages. Tests only; no lib/ changes, nothing skipped. All four files pass locally (macos 21, common 22, android 13, cache 58 + 2 pre-existing skips).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Fixes the
Flutter Tools Tests(macos + ubuntu) failures that have been red onshorebird/devsince the 3.44.1 rebase.Why they were red
The "reset DEPS to upstream 3.44.1 + shorebird overlay" was an incomplete rebase: source files were bumped to 3.44.1, but several
tool_tests/generaltest files stayed on the old (~3.41) upstream base, and the test-side of shorebird's own source divergences got dropped. So the tests didn't match the source — e.g.macos_test.dartwouldn't even compile (FakeXcodeProjectInterpreter.getInfowas missing upstream's newbuildDirectoryparam).upstream/stable(3.44.1) is green on all of these; only the fork's tests were stale.Approach
Per-file, reconcile each test with the current source in the checkout — a 3-way merge of shorebird's changes onto 3.44.1 where the file diverged both ways, plus expectation updates to match what the source actually emits. Tests only; no
lib/changes; nothing skipped or weakened.macos_test.dart— pick up upstream'sgetInfobuildDirectory+ new imports; align the iOS gen_snapshot expectations to the assembly→cc/clang→strip flow this fork uses (the fork deliberately stays on the assembly path, not upstream's--snapshot_kind=app-aot-macho-dylib).common_test.dart/android_test.dart— expect--stripon AOT-ELF gen_snapshot invocations (shorebird's strip-by-default inbase/build.dart).cache_test.dart— match thedisplayName/downloadCountartifact API (FakeSecondaryCachedArtifactgains the missing overrides) and the "Web SDK"/"Engine Information" download-status messages.Verified locally
All four files pass (
FLUTTER_ROOTset): macos 21, common 22, android 13, cache 58 (+2 pre-existing skips).dart format+dart analyzeclean.Notes
shorebird/devso the next stable bump can't silently re-rot it.flutter_tools) — assessing that next; not in this PR.For fork-maintenance review (Brandon owns the fork now).