Include stdout in codesign failure output (#115115)

This commit is contained in:
Jenn Magder 2022-11-10 14:09:20 -08:00 committed by GitHub
parent 1f891a0f33
commit c1ceda41ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 9 deletions

View File

@ -711,6 +711,16 @@ void _signFramework(Environment environment, String binaryPath, BuildMode buildM
binaryPath,
]);
if (result.exitCode != 0) {
throw Exception('Failed to codesign $binaryPath with identity $codesignIdentity.\n${result.stderr}');
final String stdout = (result.stdout as String).trim();
final String stderr = (result.stderr as String).trim();
final StringBuffer output = StringBuffer();
output.writeln('Failed to codesign $binaryPath with identity $codesignIdentity.');
if (stdout.isNotEmpty) {
output.writeln(stdout);
}
if (stderr.isNotEmpty) {
output.writeln(stderr);
}
throw Exception(output.toString());
}
}

View File

@ -836,13 +836,17 @@ void main() {
lipoCommandNonFatResult,
lipoVerifyArm64Command,
FakeCommand(command: <String>[
'codesign',
'--force',
'--sign',
'ABC123',
'--timestamp=none',
binary.path,
], exitCode: 1, stderr: 'codesign error'),
'codesign',
'--force',
'--sign',
'ABC123',
'--timestamp=none',
binary.path,
],
exitCode: 1,
stderr: 'codesign error',
stdout: 'codesign info',
),
]);
await expectLater(
@ -850,7 +854,7 @@ void main() {
throwsA(isException.having(
(Exception exception) => exception.toString(),
'description',
contains('Failed to codesign output/Flutter.framework/Flutter with identity ABC123.\ncodesign error'),
contains('Failed to codesign output/Flutter.framework/Flutter with identity ABC123.\ncodesign info\ncodesign error'),
)),
);