Commit 850eee90 authored by Devon Carew's avatar Devon Carew

Merge pull request #315 from devoncarew/fix_adb_parse

Fix adb parse
parents c49f07ee 3c943d79
...@@ -545,6 +545,12 @@ class AndroidDevice extends Device { ...@@ -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,9 +569,10 @@ class AndroidDevice extends Device { ...@@ -563,9 +569,10 @@ 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'
'Please report a bug at http://flutter.io/'); '$line\n'
'Please report a bug at http://flutter.io/');
} }
} }
return devices; return devices;
......
...@@ -8,6 +8,7 @@ pub global activate tuneup ...@@ -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)
......
...@@ -2,10 +2,11 @@ ...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment