firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix devicelab tests broken by #14173 (#14420)

Browse Source
This commit is contained in:
jcollins-g 2018-02-01 20:23:40 -08:00 committed by GitHub
parent 759dae835f
commit 08823595b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/devicelab/bin/tasks/flutter_gallery_instrumentation_test.dart
View File

@ -21,7 +21,7 @@ Future<Null> main() async {
await flutter('packages', options: <String>['get']); await flutter('packages', options: <String>['get']);
await flutter('clean'); await flutter('clean');
await flutter('build', options: <String>['apk', '--target', 'test/live_smoketest.dart']); 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>{ await exec('./tool/run_instrumentation_test.sh', <String>[], environment: <String, String>{
'JAVA_HOME': '$androidStudioPath/jre', 'JAVA_HOME': '$androidStudioPath/jre',
}); });

2
dev/devicelab/bin/tasks/gradle_plugin_test.dart
View File

@ -14,7 +14,7 @@ String javaHome;
void main() { void main() {
task(() async { task(() async {
section('Running flutter doctor to get JAVA_HOME'); 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 (.*)'); final RegExp javaHomeExtractor = new RegExp(r'Android Studio at (.*)');
javaHome = javaHomeExtractor.firstMatch(flutterDoctor).group(1) + '/jre'; javaHome = javaHomeExtractor.firstMatch(flutterDoctor).group(1) + '/jre';