Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Try rolling a new version of googletest (2021->2023).#48285

Merged
matanlurey merged 8 commits into
flutter-team-archive:mainfrom
matanlurey:engine-deps-googletest
Dec 1, 2023
Merged

Try rolling a new version of googletest (2021->2023).#48285
matanlurey merged 8 commits into
flutter-team-archive:mainfrom
matanlurey:engine-deps-googletest

Conversation

@matanlurey

@matanlurey matanlurey commented Nov 21, 2023

Copy link
Copy Markdown
Contributor

No description provided.

@zanderso

Copy link
Copy Markdown
Contributor

Looks like some updates to https://github.com/flutter/engine/blob/main/build/secondary/third_party/googletest/BUILD.gn are needed.

@matanlurey

Copy link
Copy Markdown
Contributor Author

Looks like some updates to https://github.com/flutter/engine/blob/main/build/secondary/third_party/googletest/BUILD.gn are needed.

Right, there is actually a simplified source setup now:

# Only add the "*-all.cc" files (and no headers) to improve maintainability
# from upstream refactoring. The "*-all.cc" files include the respective
# source files.
sources = [ "googletest/src/gtest-all.cc" ]

Running on CI to see how it feels :)

@matanlurey

matanlurey commented Nov 21, 2023

Copy link
Copy Markdown
Contributor Author

Looks like this will pass, with the exception of some breakages in Fuchsia I'm not sure how to resolve:

../../third_party/googletest/googlemock/include/gmock/gmock-matchers.h:4416:36: note: in instantiation of function template specialization 'testing::MatcherCast<const fuchsia::math::SizeU &, fuchsia::math::SizeU>' requested here
 4416 |           property_name, property, MatcherCast<const PropertyType&>(matcher)));
      |                                    ^
../../flutter/shell/platform/fuchsia/flutter/tests/external_view_embedder_unittests.cc:189:7: note: in instantiation of function template specialization 'testing::Property<fuchsia::ui::composition::ImageProperties, const fuchsia::math::SizeU &, fuchsia::math::SizeU>' requested here
  189 |       Property("size", &fuchsia::ui::composition::ImageProperties::size, size));
      |       ^

It might just mean gmock's secondary build needs an update too.

@matanlurey
matanlurey marked this pull request as ready for review November 30, 2023 20:41
Comment thread shell/platform/fuchsia/flutter/tests/fakes/scenic/fake_flatland_types.h Outdated
@matanlurey
matanlurey merged commit c26e6ce into flutter-team-archive:main Dec 1, 2023
@matanlurey
matanlurey deleted the engine-deps-googletest branch December 1, 2023 01:50
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 1, 2023
auto-submit Bot pushed a commit to flutter/flutter that referenced this pull request Dec 1, 2023
flutter-team-archive/engine@74d2df5...c26e6ce

2023-12-01 [email protected] Roll a new version of googletest (2021->2023). (flutter-team-archive/engine#48285)
2023-12-01 [email protected] [canvaskit] Add ImageFilter.compose (flutter-team-archive/engine#48546)
2023-12-01 [email protected] Avoid reloading the kernel snapshot when spawning an isolate in the same group (flutter-team-archive/engine#48478)
2023-12-01 [email protected] [Android] Check for text to paste before trying to retrieve data from URI (flutter-team-archive/engine#48166)
2023-11-30 [email protected] Roll Skia from 88a1bcb9e43e to 0a90c366ff87 (3 revisions) (flutter-team-archive/engine#48549)
2023-11-30 [email protected] Manual roll Dart SDK to 3.3.0-174.2.beta (4 revisions) (flutter-team-archive/engine#48538)
2023-11-30 [email protected] Roll Skia from db3399a541f3 to 88a1bcb9e43e (1 revision) (flutter-team-archive/engine#48545)
2023-11-30 [email protected] [Windows] Begin decoupling text input plugin from the view (flutter-team-archive/engine#47833)
2023-11-30 [email protected] Roll Skia from 2d236de89898 to db3399a541f3 (3 revisions) (flutter-team-archive/engine#48543)
2023-11-30 [email protected] [Impeller] Add direct tesselation of circles for DrawCircle and Round end caps (flutter-team-archive/engine#48103)
2023-11-30 [email protected] [canvaskit] Revert to `drawImage` rendering on Chrome 110 or earlier (flutter-team-archive/engine#48515)
2023-11-30 [email protected] Roll Skia from 6b4bdebaab88 to 2d236de89898 (1 revision) (flutter-team-archive/engine#48537)
2023-11-30 [email protected] [Impeller] Started expanding the blur clip region (flutter-team-archive/engine#48535)
2023-11-30 [email protected] Roll Skia from 0e479728cc1f to 6b4bdebaab88 (1 revision) (flutter-team-archive/engine#48536)
2023-11-30 [email protected] Roll Skia from 0968fe18ff75 to 0e479728cc1f (1 revision) (flutter-team-archive/engine#48534)
2023-11-30 [email protected] Use Chromium mirror for archive dependency (flutter-team-archive/engine#48509)
2023-11-30 [email protected] Roll Skia from 2f01d500a352 to 0968fe18ff75 (2 revisions) (flutter-team-archive/engine#48531)
2023-11-30 [email protected] Roll Skia from 11a15444a3aa to 2f01d500a352 (1 revision) (flutter-team-archive/engine#48524)
2023-11-30 [email protected] Roll Skia from 84fdd36b1eea to 11a15444a3aa (1 revision) (flutter-team-archive/engine#48523)
2023-11-30 [email protected] [Android] Add support for the PlatformChannel  "Share.invoke" command (flutter-team-archive/engine#48265)
2023-11-30 [email protected] Roll Skia from 5d64b1322879 to 84fdd36b1eea (1 revision) (flutter-team-archive/engine#48521)
2023-11-30 [email protected] Roll Skia from 23721750e433 to 5d64b1322879 (1 revision) (flutter-team-archive/engine#48520)
2023-11-30 [email protected] Roll Fuchsia Linux SDK from 8wu5EgBh1yJPNOd5W... to Bb2k375udWIltCEAx... (flutter-team-archive/engine#48519)
2023-11-30 [email protected] Roll Skia from 5a635f2211ce to 23721750e433 (1 revision) (flutter-team-archive/engine#48514)
2023-11-29 [email protected] Roll Skia from 928e8950e8e3 to 5a635f2211ce (1 revision) (flutter-team-archive/engine#48511)
2023-11-29 [email protected] [web] No implicit view in multi-view mode (flutter-team-archive/engine#48505)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from 8wu5EgBh1yJP to Bb2k375udWIl

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
caseycrogers pushed a commit to caseycrogers/flutter that referenced this pull request Dec 29, 2023
…39342)

flutter-team-archive/engine@74d2df5...c26e6ce

2023-12-01 [email protected] Roll a new version of googletest (2021->2023). (flutter-team-archive/engine#48285)
2023-12-01 [email protected] [canvaskit] Add ImageFilter.compose (flutter-team-archive/engine#48546)
2023-12-01 [email protected] Avoid reloading the kernel snapshot when spawning an isolate in the same group (flutter-team-archive/engine#48478)
2023-12-01 [email protected] [Android] Check for text to paste before trying to retrieve data from URI (flutter-team-archive/engine#48166)
2023-11-30 [email protected] Roll Skia from 88a1bcb9e43e to 0a90c366ff87 (3 revisions) (flutter-team-archive/engine#48549)
2023-11-30 [email protected] Manual roll Dart SDK to 3.3.0-174.2.beta (4 revisions) (flutter-team-archive/engine#48538)
2023-11-30 [email protected] Roll Skia from db3399a541f3 to 88a1bcb9e43e (1 revision) (flutter-team-archive/engine#48545)
2023-11-30 [email protected] [Windows] Begin decoupling text input plugin from the view (flutter-team-archive/engine#47833)
2023-11-30 [email protected] Roll Skia from 2d236de89898 to db3399a541f3 (3 revisions) (flutter-team-archive/engine#48543)
2023-11-30 [email protected] [Impeller] Add direct tesselation of circles for DrawCircle and Round end caps (flutter-team-archive/engine#48103)
2023-11-30 [email protected] [canvaskit] Revert to `drawImage` rendering on Chrome 110 or earlier (flutter-team-archive/engine#48515)
2023-11-30 [email protected] Roll Skia from 6b4bdebaab88 to 2d236de89898 (1 revision) (flutter-team-archive/engine#48537)
2023-11-30 [email protected] [Impeller] Started expanding the blur clip region (flutter-team-archive/engine#48535)
2023-11-30 [email protected] Roll Skia from 0e479728cc1f to 6b4bdebaab88 (1 revision) (flutter-team-archive/engine#48536)
2023-11-30 [email protected] Roll Skia from 0968fe18ff75 to 0e479728cc1f (1 revision) (flutter-team-archive/engine#48534)
2023-11-30 [email protected] Use Chromium mirror for archive dependency (flutter-team-archive/engine#48509)
2023-11-30 [email protected] Roll Skia from 2f01d500a352 to 0968fe18ff75 (2 revisions) (flutter-team-archive/engine#48531)
2023-11-30 [email protected] Roll Skia from 11a15444a3aa to 2f01d500a352 (1 revision) (flutter-team-archive/engine#48524)
2023-11-30 [email protected] Roll Skia from 84fdd36b1eea to 11a15444a3aa (1 revision) (flutter-team-archive/engine#48523)
2023-11-30 [email protected] [Android] Add support for the PlatformChannel  "Share.invoke" command (flutter-team-archive/engine#48265)
2023-11-30 [email protected] Roll Skia from 5d64b1322879 to 84fdd36b1eea (1 revision) (flutter-team-archive/engine#48521)
2023-11-30 [email protected] Roll Skia from 23721750e433 to 5d64b1322879 (1 revision) (flutter-team-archive/engine#48520)
2023-11-30 [email protected] Roll Fuchsia Linux SDK from 8wu5EgBh1yJPNOd5W... to Bb2k375udWIltCEAx... (flutter-team-archive/engine#48519)
2023-11-30 [email protected] Roll Skia from 5a635f2211ce to 23721750e433 (1 revision) (flutter-team-archive/engine#48514)
2023-11-29 [email protected] Roll Skia from 928e8950e8e3 to 5a635f2211ce (1 revision) (flutter-team-archive/engine#48511)
2023-11-29 [email protected] [web] No implicit view in multi-view mode (flutter-team-archive/engine#48505)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from 8wu5EgBh1yJP to Bb2k375udWIl

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Development

Successfully merging this pull request may close these issues.

3 participants