Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
850eee90
Commit
850eee90
authored
Nov 11, 2015
by
Devon Carew
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #315 from devoncarew/fix_adb_parse
Fix adb parse
parents
c49f07ee
3c943d79
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
device.dart
packages/flutter_tools/lib/src/device.dart
+10
-3
setup.sh
travis/setup.sh
+1
-0
test.sh
travis/test.sh
+3
-2
No files found.
packages/flutter_tools/lib/src/device.dart
View file @
850eee90
...
@@ -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,8 +569,9 @@ class AndroidDevice extends Device {
...
@@ -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/'
);
}
}
}
}
...
...
travis/setup.sh
View file @
850eee90
...
@@ -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
)
...
...
travis/test.sh
View file @
850eee90
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment