github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix an issue parsing 'adb devices' output

Browse Source
This commit is contained in:
Devon Carew 2015-11-11 14:01:37 -08:00
parent c49f07eec0
commit 3c943d79ec
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/flutter_tools/lib/src/device.dart
View File

@ -545,6 +545,12 @@ class AndroidDevice extends Device {
// Skip first line, which is always 'List of devices attached'. // Skip first line, which is always 'List of devices attached'.
for (String line in output.skip(1)) { for (String line in output.skip(1)) {
// Skip lines like:
// * daemon not running. starting it now on port 5037 *
// * daemon started successfully *
if (line.startsWith('* daemon '))
continue;
if (deviceRegex1.hasMatch(line)) { if (deviceRegex1.hasMatch(line)) {
Match match = deviceRegex1.firstMatch(line); Match match = deviceRegex1.firstMatch(line);
String deviceID = match[1]; String deviceID = match[1];
@ -563,8 +569,9 @@ class AndroidDevice extends Device {
String deviceID = match[1]; String deviceID = match[1];
devices.add(new AndroidDevice(id: deviceID)); devices.add(new AndroidDevice(id: deviceID));
} else { } else {
_logging.warning('Unexpected failure parsing device information ' _logging.warning(
'from adb output:\n$line\n' 'Unexpected failure parsing device information from adb output:\n'
'$line\n'
'Please report a bug at http://flutter.io/'); 'Please report a bug at http://flutter.io/');
} }
} }

1
travis/setup.sh
View File

@ -8,6 +8,7 @@ pub global activate tuneup
(cd packages/flutter_tools; pub get) (cd packages/flutter_tools; pub get)
(cd packages/flx; pub get) (cd packages/flx; pub get)
(cd packages/newton; pub get) (cd packages/newton; pub get)
(cd packages/playfair; pub get)
(cd packages/unit; pub get) (cd packages/unit; pub get)
(cd packages/updater; pub get) (cd packages/updater; pub get)

5
travis/test.sh
View File

@ -2,10 +2,11 @@
set -ex set -ex
(cd packages/cassowary; pub global run tuneup check; pub run test -j1) (cd packages/cassowary; pub global run tuneup check; pub run test -j1)
(cd packages/flutter_sprites; pub global run tuneup check) (cd packages/flutter_sprites; pub global run tuneup check) # No tests to run.
(cd packages/flutter_tools; pub global run tuneup check; pub run test -j1) (cd packages/flutter_tools; pub global run tuneup check; pub run test -j1)
(cd packages/flx; pub global run tuneup check; pub run test -j1) (cd packages/flx; pub global run tuneup check; pub run test -j1)
(cd packages/newton; pub global run tuneup check; pub run test -j1) (cd packages/newton; pub global run tuneup check; pub run test -j1)
(cd packages/updater; pub global run tuneup check) (cd packages/playfair; pub global run tuneup check) # No tests to run.
(cd packages/updater; pub global run tuneup check) # No tests to run.
./bin/flutter test --engine-src-path bin/cache/travis ./bin/flutter test --engine-src-path bin/cache/travis