@@ -102,28 +102,34 @@ class AndroidRunOutputTest extends RunOutputTask {
102102
103103 @override
104104 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+
105108 _findNextMatcherInList (
106109 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...' ),
108112 'Launching lib/main.dart on' ,
109113 );
110114
111115 _findNextMatcherInList (
112116 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 '..." ,
115119 );
116120
121+ // Size information is only included in release builds.
117122 _findNextMatcherInList (
118123 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 ' ,
121127 );
122128
123129 _findNextMatcherInList (
124130 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 ...' ,
127133 );
128134
129135 _findNextMatcherInList (
0 commit comments