Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Manual roll Flutter from 6bba08cbcc51 to 0975e612c04a (1 revision) #7814

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Manual roll Flutter from 6bba08cbcc51 to 0975e612c04a (1 revision) #7814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28b2c4
0975e612c [tool][android] Allow --target-platform work properly with …
engine-flutter-autoroll Oct 8, 2024
00de595
Request all ABIs
stuartmorgan Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6bba08cbcc516b599602673686813c6f3aa9a372
0975e612c04a5ffe1e840908a56cb4e1dd6f6470
11 changes: 11 additions & 0 deletions script/tool/lib/src/native_test_command.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,21 @@ this command.
'notAnnotation=io.flutter.plugins.DartIntegrationTest';

print('Running integration tests...');
// Explicitly request all ABIs, as Flutter would if being called
// without a specific target (see
// https://github.com/flutter/flutter/pull/154476) to ensure it can
// run on any architecture emulator.
const List<String> abis = <String>[
'android-arm',
'android-arm64',
'android-x64',
'android-x86'
];
final int exitCode = await project.runCommand(
'app:connectedAndroidTest',
arguments: <String>[
'-Pandroid.testInstrumentationRunnerArguments.$filter',
'-Ptarget-platform=${abis.join(',')}',
],
);
if (exitCode != 0) {
Expand Down
14 changes: 10 additions & 4 deletions script/tool/test/native_test_command_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ import 'package:test/test.dart';
import 'mocks.dart';
import 'util.dart';

const String _allAbiFlag =
'-Ptarget-platform=android-arm,android-arm64,android-x64,android-x86';

const String _androidIntegrationTestFilter =
'-Pandroid.testInstrumentationRunnerArguments.'
'notAnnotation=io.flutter.plugins.DartIntegrationTest';
Expand Down Expand Up @@ -563,6 +566,7 @@ void main() {
const <String>[
'app:connectedAndroidTest',
_androidIntegrationTestFilter,
_allAbiFlag,
],
androidFolder.path,
),
Expand Down Expand Up @@ -697,6 +701,7 @@ public class FlutterActivityTest {
const <String>[
'app:connectedAndroidTest',
_androidIntegrationTestFilter,
_allAbiFlag,
],
androidFolder.path,
),
Expand Down Expand Up @@ -734,6 +739,7 @@ public class FlutterActivityTest {
const <String>[
'app:connectedAndroidTest',
_androidIntegrationTestFilter,
_allAbiFlag,
],
androidFolder.path,
),
Expand Down Expand Up @@ -1469,12 +1475,12 @@ public class FlutterActivityTest {
processRunner.mockProcessesForExecutable['xcrun'] = <FakeProcessInfo>[
getMockXcodebuildListProcess(
<String>['RunnerTests', 'RunnerUITests']), // iOS list
FakeProcessInfo(
MockProcess(), <String>['xcodebuild', 'clean', 'test']), // iOS run
FakeProcessInfo(MockProcess(),
<String>['xcodebuild', 'clean', 'test']), // iOS run
getMockXcodebuildListProcess(
<String>['RunnerTests', 'RunnerUITests']), // macOS list
FakeProcessInfo(
MockProcess(), <String>['xcodebuild', 'clean', 'test']), // macOS run
FakeProcessInfo(MockProcess(),
<String>['xcodebuild', 'clean', 'test']), // macOS run
];

final List<String> output = await runCapturingPrint(runner, <String>[
Expand Down