Skip to content

Commit d4ab7cd

Browse files
committed
[flutter_tools] Fix Xcode-less macOS CI check in tool_extensions_test
Compare `flutter emulators` exit status with `FLUTTER_TOOL_EXTENSIONS=true` against a `FLUTTER_TOOL_EXTENSIONS=false` baseline when `ANDROID_HOME` is absent so `tool_extensions_test.dart` passes on macOS CI shards that omit Xcode (`$flutter/osx_sdk`) while still asserting identical exit codes on Xcode-enabled macOS hosts. Part of flutter#190755 Part of flutter#190750
1 parent 9474d57 commit d4ab7cd

1 file changed

Lines changed: 23 additions & 14 deletions

File tree

‎packages/flutter_tools/test/integration.shard/tool_extensions_test.dart‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -192,25 +192,34 @@ void main() {
192192
});
193193

194194
testWithoutContext(
195-
'flutter emulators does not expose prototype emulators or fail built-in behavior when enabled',
195+
'flutter emulators does not expose prototype emulators or alter built-in behavior when enabled',
196196
() async {
197197
final String missingAndroidSdk = tempHome.childDirectory('missing_android_sdk').path;
198-
final ProcessResult result = await processManager.run(
198+
final envWithoutAndroid = <String, String>{
199+
...baseEnv,
200+
'ANDROID_HOME': missingAndroidSdk,
201+
'ANDROID_SDK_ROOT': missingAndroidSdk,
202+
};
203+
final ProcessResult baseline = await processManager.run(
204+
<String>[flutterBin, 'emulators'],
205+
environment: <String, String>{...envWithoutAndroid, 'FLUTTER_TOOL_EXTENSIONS': 'false'},
206+
);
207+
final ProcessResult enabled = await processManager.run(
199208
<String>[flutterBin, 'emulators'],
200-
environment: <String, String>{
201-
...baseEnv,
202-
'ANDROID_HOME': missingAndroidSdk,
203-
'ANDROID_SDK_ROOT': missingAndroidSdk,
204-
'FLUTTER_TOOL_EXTENSIONS': 'true',
205-
},
209+
environment: <String, String>{...envWithoutAndroid, 'FLUTTER_TOOL_EXTENSIONS': 'true'},
206210
);
207211

208-
expect(result.stdout, isNot(contains('Linux Custom Extension Prototype')));
209-
if (const LocalPlatform().isMacOS) {
210-
expect(result.exitCode, 0, reason: 'stdout: ${result.stdout}\nstderr: ${result.stderr}');
211-
} else {
212-
expect(result.exitCode, 1);
213-
expect(result.stderr, contains('Unable to find any emulator sources.'));
212+
expect(enabled.stdout, isNot(contains('Linux Custom Extension Prototype')));
213+
expect(
214+
enabled.exitCode,
215+
baseline.exitCode,
216+
reason:
217+
'baseline stdout: ${baseline.stdout}\nbaseline stderr: ${baseline.stderr}\n'
218+
'enabled stdout: ${enabled.stdout}\nenabled stderr: ${enabled.stderr}',
219+
);
220+
if (!const LocalPlatform().isMacOS || baseline.exitCode != 0) {
221+
expect(enabled.exitCode, 1);
222+
expect(enabled.stderr, contains('Unable to find any emulator sources.'));
214223
}
215224
},
216225
);

0 commit comments

Comments
 (0)