firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fail integration test if expected bitcode markers not found (#102016)

Browse Source
This commit is contained in:
Jenn Magder 2022-04-19 13:29:06 -07:00 committed by GitHub
parent fecc8904ff
commit 88eca6c1ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/devicelab/bin/tasks/module_test_ios.dart
View File

@ -462,7 +462,7 @@ end
if ((await fileType(builtFlutterBinary)).contains('armv7')) { if ((await fileType(builtFlutterBinary)).contains('armv7')) {
throw TaskResult.failure('Unexpected armv7 architecture slice in $builtFlutterBinary'); throw TaskResult.failure('Unexpected armv7 architecture slice in $builtFlutterBinary');
} }
await containsBitcode(builtFlutterBinary); await checkContainsBitcode(builtFlutterBinary);
final String builtAppBinary = path.join( final String builtAppBinary = path.join(
archivedAppPath, archivedAppPath,
@ -474,7 +474,7 @@ end
if ((await fileType(builtAppBinary)).contains('armv7')) { if ((await fileType(builtAppBinary)).contains('armv7')) {
throw TaskResult.failure('Unexpected armv7 architecture slice in $builtAppBinary'); throw TaskResult.failure('Unexpected armv7 architecture slice in $builtAppBinary');
} }
await containsBitcode(builtAppBinary); await checkContainsBitcode(builtAppBinary);
// The host app example builds plugins statically, url_launcher_ios.framework // The host app example builds plugins statically, url_launcher_ios.framework
// should not exist. // should not exist.

7
dev/devicelab/lib/framework/ios.dart
View File

@ -8,6 +8,7 @@ import 'dart:io';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'host_agent.dart'; import 'host_agent.dart';
import 'task_result.dart';
import 'utils.dart'; import 'utils.dart';
typedef SimulatorFunction = Future<void> Function(String deviceId); typedef SimulatorFunction = Future<void> Function(String deviceId);
@ -84,6 +85,12 @@ Future<bool> containsBitcode(String pathToBinary) async {
return !emptyBitcodeMarkerFound; return !emptyBitcodeMarkerFound;
} }
Future<void> checkContainsBitcode(String pathToBinary) async {
if (!await containsBitcode(pathToBinary)) {
throw TaskResult.failure('Expected bitcode in $pathToBinary');
}
}
/// Creates and boots a new simulator, passes the new simulator's identifier to /// Creates and boots a new simulator, passes the new simulator's identifier to
/// `testFunction`. /// `testFunction`.
/// ///