Skip to content

Commit 88eca6c

Browse files
authored
Fail integration test if expected bitcode markers not found (#102016)
1 parent fecc890 commit 88eca6c

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

dev/devicelab/bin/tasks/module_test_ios.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ end
462462
if ((await fileType(builtFlutterBinary)).contains('armv7')) {
463463
throw TaskResult.failure('Unexpected armv7 architecture slice in $builtFlutterBinary');
464464
}
465-
await containsBitcode(builtFlutterBinary);
465+
await checkContainsBitcode(builtFlutterBinary);
466466

467467
final String builtAppBinary = path.join(
468468
archivedAppPath,
@@ -474,7 +474,7 @@ end
474474
if ((await fileType(builtAppBinary)).contains('armv7')) {
475475
throw TaskResult.failure('Unexpected armv7 architecture slice in $builtAppBinary');
476476
}
477-
await containsBitcode(builtAppBinary);
477+
await checkContainsBitcode(builtAppBinary);
478478

479479
// The host app example builds plugins statically, url_launcher_ios.framework
480480
// should not exist.

dev/devicelab/lib/framework/ios.dart

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'dart:io';
88
import 'package:path/path.dart' as path;
99

1010
import 'host_agent.dart';
11+
import 'task_result.dart';
1112
import 'utils.dart';
1213

1314
typedef SimulatorFunction = Future<void> Function(String deviceId);
@@ -84,6 +85,12 @@ Future<bool> containsBitcode(String pathToBinary) async {
8485
return !emptyBitcodeMarkerFound;
8586
}
8687

88+
Future<void> checkContainsBitcode(String pathToBinary) async {
89+
if (!await containsBitcode(pathToBinary)) {
90+
throw TaskResult.failure('Expected bitcode in $pathToBinary');
91+
}
92+
}
93+
8794
/// Creates and boots a new simulator, passes the new simulator's identifier to
8895
/// `testFunction`.
8996
///

0 commit comments

Comments
 (0)