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
08823595
Unverified
Commit
08823595
authored
Feb 02, 2018
by
jcollins-g
Committed by
GitHub
Feb 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix devicelab tests broken by #14173 (#14420)
parent
759dae83
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
flutter_gallery_instrumentation_test.dart
...celab/bin/tasks/flutter_gallery_instrumentation_test.dart
+1
-1
gradle_plugin_test.dart
dev/devicelab/bin/tasks/gradle_plugin_test.dart
+1
-1
No files found.
dev/devicelab/bin/tasks/flutter_gallery_instrumentation_test.dart
View file @
08823595
...
...
@@ -21,7 +21,7 @@ Future<Null> main() async {
await
flutter
(
'packages'
,
options:
<
String
>[
'get'
]);
await
flutter
(
'clean'
);
await
flutter
(
'build'
,
options:
<
String
>[
'apk'
,
'--target'
,
'test/live_smoketest.dart'
]);
final
String
androidStudioPath
=
grep
(
'Android Studio at'
,
from:
await
evalFlutter
(
'doctor'
)).
first
.
split
(
' '
).
last
;
final
String
androidStudioPath
=
grep
(
'Android Studio at'
,
from:
await
evalFlutter
(
'doctor'
,
options:
<
String
>[
'-v'
]
)).
first
.
split
(
' '
).
last
;
await
exec
(
'./tool/run_instrumentation_test.sh'
,
<
String
>[],
environment:
<
String
,
String
>{
'JAVA_HOME'
:
'
$androidStudioPath
/jre'
,
});
...
...
dev/devicelab/bin/tasks/gradle_plugin_test.dart
View file @
08823595
...
...
@@ -14,7 +14,7 @@ String javaHome;
void
main
(
)
{
task
(()
async
{
section
(
'Running flutter doctor to get JAVA_HOME'
);
final
String
flutterDoctor
=
await
evalFlutter
(
'doctor'
);
final
String
flutterDoctor
=
await
evalFlutter
(
'doctor'
,
options:
<
String
>[
'-v'
]
);
final
RegExp
javaHomeExtractor
=
new
RegExp
(
r'Android Studio at (.*)'
);
javaHome
=
javaHomeExtractor
.
firstMatch
(
flutterDoctor
).
group
(
1
)
+
'/jre'
;
...
...
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