@@ -102,28 +102,34 @@ class AndroidRunOutputTest extends RunOutputTask {
102
102
103
103
@override
104
104
TaskResult verify (List <String > stdout, List <String > stderr) {
105
+ final String gradleTask = release ? 'assembleRelease' : 'assembleDebug' ;
106
+ final String apk = release ? 'app-release.apk' : 'app-debug.apk' ;
107
+
105
108
_findNextMatcherInList (
106
109
stdout,
107
- (String line) => line.startsWith ('Launching lib/main.dart on ' ) && line.endsWith (' in release mode...' ),
110
+ (String line) => line.startsWith ('Launching lib/main.dart on ' ) &&
111
+ line.endsWith (' in ${release ? 'release' : 'debug' } mode...' ),
108
112
'Launching lib/main.dart on' ,
109
113
);
110
114
111
115
_findNextMatcherInList (
112
116
stdout,
113
- (String line) => line.startsWith ("Running Gradle task 'assembleRelease '..." ),
114
- "Running Gradle task 'assembleRelease '..." ,
117
+ (String line) => line.startsWith ("Running Gradle task '$ gradleTask '..." ),
118
+ "Running Gradle task '$ gradleTask '..." ,
115
119
);
116
120
121
+ // Size information is only included in release builds.
117
122
_findNextMatcherInList (
118
123
stdout,
119
- (String line) => line.contains ('Built build/app/outputs/flutter-apk/app-release.apk (' ) && line.contains ('MB).' ),
120
- 'Built build/app/outputs/flutter-apk/app-release.apk' ,
124
+ (String line) => line.contains ('Built build/app/outputs/flutter-apk/$apk ' ) &&
125
+ (! release || line.contains ('MB).' )),
126
+ 'Built build/app/outputs/flutter-apk/$apk ' ,
121
127
);
122
128
123
129
_findNextMatcherInList (
124
130
stdout,
125
- (String line) => line.startsWith ('Installing build/app/outputs/flutter-apk/app-release. apk...' ),
126
- 'Installing build/app/outputs/flutter-apk/app-release. apk...' ,
131
+ (String line) => line.startsWith ('Installing build/app/outputs/flutter-apk/$ apk ...' ),
132
+ 'Installing build/app/outputs/flutter-apk/$ apk ...' ,
127
133
);
128
134
129
135
_findNextMatcherInList (
0 commit comments