New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[et] Lookup output filesystem path, not label #52248
Conversation
2f83a74
to
502cf97
Compare
b2ad2e8
to
f5fde03
Compare
Sets BuildTarget.executable to the `root_out_dir`-relative path of the executable (e.g. `displaylist_unittests`) instead of its label (e.g. `//out/host_debug/displaylist_unittests`). This is required since, in the lines following the output lookup, we assume it to be a path relative to the build output directory. Also breaks out functions for: * `_gnDesc`: returns the JSON output of `gn desc buildDir target` * `_gnOutputs`: returns the output files listed by `gn outputs buildDir target` Noticed while working on: flutter/flutter#147071
f5fde03
to
51f7612
Compare
expect(testEnv.processHistory.length, greaterThanOrEqualTo(2)); | ||
expect(testEnv.processHistory[3].command[0], contains('ninja')); | ||
expect(testEnv.processHistory[3].command[2], endsWith('/host_debug')); | ||
expect(testEnv.processHistory.length, greaterThan(6)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed to a strictly greater-than check so that it matches the processHistory index we refer to, which will make it a little more obvious to people who modify this in the future.
@@ -83,7 +85,7 @@ void main() { | |||
'//third_party/protobuf:protoc', | |||
]); | |||
expect(result, equals(1)); | |||
expect(testEnvironment.processHistory.length, lessThan(3)); | |||
expect(testEnvironment.processHistory.length, lessThan(6)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here and in the test above it: This expectation is impacted by implementation details of the test command. I don't think the number of processes executed is the right test, and instead we should just test that test processes are executed and that non-test processes are executed.
I can send out a followup that fixes that. (I realise I also just added this test in a previous patch so I'm 100% to blame for this one :P)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think this count is too brittle. Better to have something like:
expect(testEnvironment.processHistory, executed('gn desc'));
@@ -83,7 +85,7 @@ void main() { | |||
'//third_party/protobuf:protoc', | |||
]); | |||
expect(result, equals(1)); | |||
expect(testEnvironment.processHistory.length, lessThan(3)); | |||
expect(testEnvironment.processHistory.length, lessThan(6)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think this count is too brittle. Better to have something like:
expect(testEnvironment.processHistory, executed('gn desc'));
…147190) flutter/engine@a4b71f0...33c828f 2024-04-22 skia-flutter-autoroll@skia.org Roll Skia from eb29b46236e6 to 3b32e3280b67 (1 revision) (flutter/engine#52298) 2024-04-22 magder@google.com Break dependency cycle of FlutterViewController <-> FlutterPlatformView (flutter/engine#52271) 2024-04-22 chris@bracken.jp [et] Lookup output filesystem path, not label (flutter/engine#52248) 2024-04-22 skia-flutter-autoroll@skia.org Roll Skia from 975859a96f8f to eb29b46236e6 (9 revisions) (flutter/engine#52297) 2024-04-22 1961493+harryterkelsen@users.noreply.github.com [canvaskit] Add configuration for maximum canvases (flutter/engine#51735) 2024-04-22 120297255+PurplePolyhedron@users.noreply.github.com Fix link in BlendMode.saturation (flutter/engine#52156) 2024-04-22 magder@google.com Refactor and migrate FlutterUndoManagerPlugin to ARC (flutter/engine#52234) 2024-04-22 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from Rr9lFiKCPhMXDGa89... to L533ubzhjWwW7jxbc... (flutter/engine#52293) 2024-04-22 skia-flutter-autoroll@skia.org Roll Dart SDK from 0a83dd7e61b1 to 0ed66a4d77cb (1 revision) (flutter/engine#52294) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from Rr9lFiKCPhMX to L533ubzhjWwW 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 jsimmons@google.com,rmistry@google.com,zra@google.com 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
Sets BuildTarget.executable to the
root_out_dir
-relative path of the executable (e.g.displaylist_unittests
) instead of its label (e.g.//out/host_debug/displaylist_unittests
). This is required since, in the lines following the output lookup, we assume it to be a path relative to the build output directory.Also breaks out functions for:
_runGnDesc
: returns the JSON output ofgn desc buildDir target
_runGnOutputs
: returns the output files listed bygn outputs buildDir target
Noticed while working on: flutter/flutter#147071
Pre-launch Checklist
///
).If you need help, consider asking for advice on the #hackers-new channel on Discord.