diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index 8802c800a9..f31789145c 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart @@ -356,9 +356,9 @@ class _IOSDeviceLogReader extends DeviceLogReader { // Match for lines for the runner in syslog. // // iOS 9 format: Runner[297] : - // iOS 10 format: Runner(libsystem_asl.dylib)[297] : + // iOS 10 format: Runner(Flutter)[297] : final String appName = app == null ? '' : app.name.replaceAll('.app', ''); - _lineRegex = new RegExp(appName + r'(\(.*\))?\[[\d]+\] <[A-Za-z]+>: '); + _lineRegex = new RegExp(appName + r'(\(Flutter\))?\[[\d]+\] <[A-Za-z]+>: '); } final IOSDevice device; diff --git a/packages/flutter_tools/test/ios/devices_test.dart b/packages/flutter_tools/test/ios/devices_test.dart index 844a24c5cb..0c21dcf05d 100644 --- a/packages/flutter_tools/test/ios/devices_test.dart +++ b/packages/flutter_tools/test/ios/devices_test.dart @@ -83,10 +83,11 @@ f577a7903cc54959be2e34bc4f7f80b7009efcf4 when(mockIMobileDevice.startLogger()).thenAnswer((_) { final Process mockProcess = new MockProcess(); when(mockProcess.stdout).thenReturn(new Stream>.fromIterable(>[''' - Runner(libsystem_asl.dylib)[297] : A is for ari + Runner(Flutter)[297] : A is for ari Runner(libsystem_asl.dylib)[297] : libMobileGestalt MobileGestaltSupport.m:153: pid 123 (Runner) does not have sandbox access for frZQaeyWLUvLjeuEK43hmg and IS NOT appropriately entitled Runner(libsystem_asl.dylib)[297] : libMobileGestalt MobileGestalt.c:550: no access to InverseDeviceID (see ) - Runner(libsystem_asl.dylib)[297] : I is for ichigo + Runner(Flutter)[297] : I is for ichigo + Runner(UIKit)[297] : E is for enpitsu" '''.codeUnits])); when(mockProcess.stderr).thenReturn(const Stream>.empty()); // Delay return of exitCode until after stdout stream data, since it terminates the logger.