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

Conversation

@gaaclarke
Copy link
Member

test exempt: test only code

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@gaaclarke gaaclarke marked this pull request as ready for review December 5, 2024 23:52
Copy link
Contributor

@jonahwilliams jonahwilliams left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

TBH I don't really like gmock and its macros that much, but being able to capture arguments seems useful.

@gaaclarke gaaclarke merged commit 9eb1c7d into flutter:main Dec 6, 2024
28 checks passed
@gaaclarke
Copy link
Member Author

TBH I don't really like gmock and its macros that much, but being able to capture arguments seems useful.

Yea, what we had before was just an inferior non-standard alternative to gmock. Hopefully this convinces you there are good times to use it.

@jonahwilliams
Copy link
Contributor

reason for revert: compilation error at head.

@jonahwilliams jonahwilliams added the revert Label used to revert changes in a closed and merged pull request. label Dec 6, 2024
@gaaclarke
Copy link
Member Author

Oh, you think this is just a case of stale presubmits? Could be.

auto-submit bot pushed a commit that referenced this pull request Dec 6, 2024
@auto-submit auto-submit bot removed the revert Label used to revert changes in a closed and merged pull request. label Dec 6, 2024
auto-submit bot added a commit that referenced this pull request Dec 6, 2024
…6995)" (#57016)

Reverts: #56995
Initiated by: jonahwilliams
Reason for reverting: compilation error at head.
Original PR Author: gaaclarke

Reviewed By: {jonahwilliams}

This change reverts the following previous change:
test exempt: test only code

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
@a-siva
Copy link
Contributor

a-siva commented Dec 6, 2024

This PR seems to have caused errors in the Flutter benchmark builds (golem)

70 | auto mock_gles = MockGLES::Init(extensions);
| ^~~~~~~~~~~~~~
../../flutter/impeller/renderer/backend/gles/test/mock_gles.h:83:36: note: candidate function not viable: no known conversion from 'const std::vector' to 'std::unique_ptr' for 1st argument
83 | static std::shared_ptr Init(
| ^
84 | std::unique_ptr impl,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../flutter/impeller/renderer/backend/gles/test/mock_gles.h:92:36: note: candidate function not viable: no known conversion from 'const std::vector' to 'const std::optional>' for 1st argument
92 | static std::shared_ptr Init(
93 | const std::optional>& extensions = std::nullopt,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

gaaclarke added a commit to gaaclarke/engine that referenced this pull request Dec 6, 2024
test exempt: test only code

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide] and the [C++,
Objective-C, Java style guides].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I added new tests to check the change I am making or feature I am
adding, or the PR is [test-exempt]. See [testing the engine] for
instructions on writing and running engine tests.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I signed the [CLA].
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md
[C++, Objective-C, Java style guides]:
https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
[testing the engine]:
https://github.com/flutter/engine/blob/main/docs/testing/Testing-the-engine.md
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 6, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 6, 2024
auto-submit bot pushed a commit that referenced this pull request Dec 6, 2024
)

relands #56995

It previously landed with stale presubmits, this should be up to date now.  I have the fix in a separate commit.

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 6, 2024
github-merge-queue bot pushed a commit to flutter/flutter that referenced this pull request Dec 6, 2024
…159909)

flutter/engine@31ba1e0...d42645f

2024-12-06 [email protected] Reland: Replaces
bespoke call captures from mock gles with gmock (flutter/engine#57019)
2024-12-06 [email protected] Roll Skia from c9647f13cded to
0d94e966268b (36 revisions) (flutter/engine#57023)
2024-12-06 [email protected] iOS: add null check on create impeller
context (flutter/engine#56952)
2024-12-06 [email protected] Roll Dart SDK from
9c9a333c496c to 67ce49b905f7 (2 revisions) (flutter/engine#57013)
2024-12-06 98614782+auto-submit[bot]@users.noreply.github.com Reverts
"Replaces bespoke call captures from mock gles with gmock (#56995)"
(flutter/engine#57016)
2024-12-06 [email protected] Replaces bespoke
call captures from mock gles with gmock (flutter/engine#56995)
2024-12-06 [email protected] [Impeller] Require the
GLES multisampled_render_to_texture2 extension for offscreen MSAA
(flutter/engine#56997)

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] 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
nick9822 pushed a commit to nick9822/flutter that referenced this pull request Dec 18, 2024
…ine#56995)

test exempt: test only code

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide] and the [C++,
Objective-C, Java style guides].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I added new tests to check the change I am making or feature I am
adding, or the PR is [test-exempt]. See [testing the engine] for
instructions on writing and running engine tests.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I signed the [CLA].
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md
[C++, Objective-C, Java style guides]:
https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
[testing the engine]:
https://github.com/flutter/engine/blob/main/docs/testing/Testing-the-engine.md
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
nick9822 pushed a commit to nick9822/flutter that referenced this pull request Dec 18, 2024
…utter#56995)" (flutter/engine#57016)

Reverts: flutter/engine#56995
Initiated by: jonahwilliams
Reason for reverting: compilation error at head.
Original PR Author: gaaclarke

Reviewed By: {jonahwilliams}

This change reverts the following previous change:
test exempt: test only code

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
nick9822 pushed a commit to nick9822/flutter that referenced this pull request Dec 18, 2024
…tter/engine#57019)

relands flutter/engine#56995

It previously landed with stale presubmits, this should be up to date now.  I have the fix in a separate commit.

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants