firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add note to doctor validator if script is running Rosetta (#101309)

Browse Source
This commit is contained in:
Jenn Magder
2022-04-05 10:37:35 -07:00
committed by GitHub
parent d6cc67d529
commit 839a183ea6
2 changed files with 71 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/flutter_tools/lib/src/base/os.dart
View File

@@ -372,10 +372,16 @@ class _MacOSUtils extends _PosixUtils {
_processUtils.runSync(<String>['sw_vers', '-productName']),
_processUtils.runSync(<String>['sw_vers', '-productVersion']),
_processUtils.runSync(<String>['sw_vers', '-buildVersion']),
_processUtils.runSync(<String>['uname', '-m']),
];
if (results.every((RunResult result) => result.exitCode == 0)) {
String osName = getNameForHostPlatform(hostPlatform);
// If the script is running in Rosetta, "uname -m" will return x86_64.
if (hostPlatform == HostPlatform.darwin_arm && results[3].stdout.contains('x86_64')) {
osName = '$osName (Rosetta)';
}
_name =
'${results[0].stdout.trim()} ${results[1].stdout.trim()} ${results[2].stdout.trim()} ${getNameForHostPlatform(hostPlatform)}';
'${results[0].stdout.trim()} ${results[1].stdout.trim()} ${results[2].stdout.trim()} $osName';
}
_name ??= super.name;
}

64
packages/flutter_tools/test/general.shard/base/os_test.dart
View File

@@ -311,6 +311,13 @@ void main() {
],
stdout: 'build',
),
const FakeCommand(
command: <String>[
'uname',
'-m',
],
stdout: 'arm64',
),
const FakeCommand(
command: <String>[
'which',
@@ -331,6 +338,56 @@ void main() {
expect(utils.name, 'product version build darwin-arm');
});
testWithoutContext('macOS ARM on Rosetta name', () async {
fakeProcessManager.addCommands(<FakeCommand>[
const FakeCommand(
command: <String>[
'sw_vers',
'-productName',
],
stdout: 'product',
),
const FakeCommand(
command: <String>[
'sw_vers',
'-productVersion',
],
stdout: 'version',
),
const FakeCommand(
command: <String>[
'sw_vers',
'-buildVersion',
],
stdout: 'build',
),
const FakeCommand(
command: <String>[
'uname',
'-m',
],
stdout: 'x86_64', // Running on Rosetta
),
const FakeCommand(
command: <String>[
'which',
'sysctl',
],
),
const FakeCommand(
command: <String>[
'sysctl',
'hw.optional.arm64',
],
stdout: 'hw.optional.arm64: 1',
),
]);
final OperatingSystemUtils utils =
createOSUtils(FakePlatform(operatingSystem: 'macos'));
expect(utils.name, 'product version build darwin-arm (Rosetta)');
});
testWithoutContext('macOS x86 name', () async {
fakeProcessManager.addCommands(<FakeCommand>[
const FakeCommand(
@@ -354,6 +411,13 @@ void main() {
],
stdout: 'build',
),
const FakeCommand(
command: <String>[
'uname',
'-m',
],
stdout: 'x86_64',
),
const FakeCommand(
command: <String>[
'which',