Skip to content

Commit dee15f5

Browse files
matanlureymatanlurey
authored
Re-land flutter#162644: Remove --verbose from devicelab task executions. (flutter#163017)
Re-lands flutter#162644. Reverts 7569fbf, with the change to `ios_app_with_extensions_test.dart` omitted, which is intentional (`--verbose` is load-bearing and used to check for a particular message).
1 parent 2e74a87 commit dee15f5

13 files changed

+20
-76
lines changed

‎dev/devicelab/bin/tasks/android_obfuscate_test.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Future<void> main() async {
2222
'--target-platform=android-arm',
2323
'--obfuscate',
2424
'--split-debug-info=foo/',
25-
'--verbose',
2625
],
2726
);
2827
});
@@ -67,7 +66,6 @@ Future<void> main() async {
6766
'--split-debug-info=foo/',
6867
'--no-debug',
6968
'--no-profile',
70-
'--verbose',
7169
],
7270
);
7371
});

‎dev/devicelab/bin/tasks/build_aar_module_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Future<void> main() async {
9393
section('Build release AAR');
9494

9595
await inDirectory(projectDir, () async {
96-
await flutter('build', options: <String>['aar', '--verbose']);
96+
await flutter('build', options: <String>['aar']);
9797
});
9898

9999
final String repoPath = path.join(projectDir.path, 'build', 'host', 'outputs', 'repo');

‎dev/devicelab/bin/tasks/build_ios_framework_module_test.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ Future<void> _testBuildIosFramework(Directory projectDir, {bool isModule = false
8585
'build',
8686
options: <String>[
8787
'ios-framework',
88-
'--verbose',
8988
'--output=$outputDirectoryName',
9089
'--obfuscate',
9190
'--split-debug-info=symbols',
@@ -470,7 +469,6 @@ Future<void> _testBuildMacOSFramework(Directory projectDir) async {
470469
'build',
471470
options: <String>[
472471
'macos-framework',
473-
'--verbose',
474472
'--output=$outputDirectoryName',
475473
'--obfuscate',
476474
'--split-debug-info=symbols',

‎dev/devicelab/bin/tasks/flutter_gallery_v2_chrome_run_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class NewGalleryChromeRunTest {
4444

4545
await flutter('build', options: <String>['web', '-v', '--release', '--no-pub']);
4646

47-
final List<String> options = <String>['-d', 'chrome', '--verbose', '--resident'];
47+
final List<String> options = <String>['-d', 'chrome', '--resident'];
4848
final Process process = await startFlutter('run', options: options);
4949

5050
final Completer<void> stdoutDone = Completer<void>();

‎dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,7 @@ Future<void> main() async {
8181
section('Build app bundle using the flutter tool - flavor: flavor_underscore');
8282

8383
int exitCode = await inDirectory(project.rootPath, () {
84-
return flutter(
85-
'build',
86-
options: <String>['appbundle', '--flavor=flavor_underscore', '--verbose'],
87-
);
84+
return flutter('build', options: <String>['appbundle', '--flavor=flavor_underscore']);
8885
});
8986

9087
if (exitCode != 0) {
@@ -114,10 +111,7 @@ Future<void> main() async {
114111
section('Build app bundle using the flutter tool - flavor: production');
115112

116113
exitCode = await inDirectory(project.rootPath, () {
117-
return flutter(
118-
'build',
119-
options: <String>['appbundle', '--flavor=production', '--verbose'],
120-
);
114+
return flutter('build', options: <String>['appbundle', '--flavor=production']);
121115
});
122116

123117
if (exitCode != 0) {

‎dev/devicelab/bin/tasks/gradle_plugin_fat_apk_test.dart

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Future<void> main() async {
1616
await runPluginProjectTest((FlutterPluginProject pluginProject) async {
1717
section('APK content for task assembleDebug without explicit target platform');
1818
await inDirectory(pluginProject.exampleAndroidPath, () {
19-
return flutter('build', options: <String>['apk', '--debug', '--verbose']);
19+
return flutter('build', options: <String>['apk', '--debug']);
2020
});
2121

2222
Iterable<String> apkFiles = await getFilesInApk(pluginProject.debugApkPath);
@@ -42,7 +42,7 @@ Future<void> main() async {
4242
section('APK content for task assembleRelease without explicit target platform');
4343

4444
await inDirectory(pluginProject.exampleAndroidPath, () {
45-
return flutter('build', options: <String>['apk', '--release', '--verbose']);
45+
return flutter('build', options: <String>['apk', '--release']);
4646
});
4747

4848
apkFiles = await getFilesInApk(pluginProject.releaseApkPath);
@@ -67,12 +67,7 @@ Future<void> main() async {
6767
await inDirectory(pluginProject.exampleAndroidPath, () {
6868
return flutter(
6969
'build',
70-
options: <String>[
71-
'apk',
72-
'--release',
73-
'--verbose',
74-
'--target-platform=android-arm,android-arm64',
75-
],
70+
options: <String>['apk', '--release', '--target-platform=android-arm,android-arm64'],
7671
);
7772
});
7873

@@ -100,7 +95,6 @@ Future<void> main() async {
10095
options: <String>[
10196
'apk',
10297
'--release',
103-
'--verbose',
10498
'--split-per-abi',
10599
'--target-platform=android-arm,android-arm64',
106100
],
@@ -136,7 +130,7 @@ Future<void> main() async {
136130
section('gradlew assembleRelease');
137131

138132
await inDirectory(project.rootPath, () {
139-
return flutter('build', options: <String>['apk', '--release', '--verbose']);
133+
return flutter('build', options: <String>['apk', '--release']);
140134
});
141135

142136
// When the platform-target isn't specified, we generate the snapshots

‎dev/devicelab/bin/tasks/hello_world__memory.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class HelloWorldMemoryTest extends MemoryTest {
2121
print('launching $project$test on device...');
2222
await flutter(
2323
'run',
24-
options: <String>['--verbose', '--release', '--no-resident', '-d', device!.deviceId, test],
24+
options: <String>['--release', '--no-resident', '-d', device!.deviceId, test],
2525
);
2626
await Future<void>.delayed(const Duration(milliseconds: 1500));
2727
await recordStart();

‎dev/devicelab/bin/tasks/module_test_ios.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ dependencies:
8585
section('Build ephemeral host app in release mode without CocoaPods');
8686

8787
await inDirectory(projectDir, () async {
88-
await flutter('build', options: <String>['ios', '--no-codesign', '--verbose']);
88+
await flutter('build', options: <String>['ios', '--no-codesign']);
8989
});
9090

9191
// Check the tool is no longer copying to the legacy xcframework location.
@@ -606,7 +606,7 @@ end
606606
);
607607

608608
if (!xcodebuildOutput.contains(
609-
'flutter --verbose --local-engine-src-path=bogus assemble',
609+
RegExp('flutter.*--local-engine-src-path=bogus assemble'),
610610
) || // Verbose output
611611
!xcodebuildOutput.contains(
612612
'Unable to detect a Flutter engine build directory in bogus',

‎dev/devicelab/bin/tasks/plugin_dependencies_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public class DummyPluginAClass {
280280
section('Build plugin A example iOS app');
281281

282282
await inDirectory(exampleApp, () async {
283-
await evalFlutter('build', options: <String>['ios', '--no-codesign', '--verbose']);
283+
await evalFlutter('build', options: <String>['ios', '--no-codesign']);
284284
});
285285

286286
final Directory appBundle = Directory(

‎dev/devicelab/bin/tasks/plugin_lint_mac.dart

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,15 @@ Future<void> main() async {
3737
'integration_test.podspec',
3838
);
3939

40-
await exec('pod', <String>[
41-
'lib',
42-
'lint',
43-
iosintegrationTestPodspec,
44-
'--use-libraries',
45-
'--verbose',
46-
]);
40+
await exec('pod', <String>['lib', 'lint', iosintegrationTestPodspec, '--use-libraries']);
4741

4842
final String macosintegrationTestPodspec = path.join(
4943
integrationTestPackage,
5044
'integration_test_macos',
5145
'macos',
5246
'integration_test_macos.podspec',
5347
);
54-
await _tryMacOSLint(macosintegrationTestPodspec, <String>['--verbose']);
48+
await _tryMacOSLint(macosintegrationTestPodspec, <String>[]);
5549
});
5650

5751
section('Create Objective-C plugin');
@@ -76,13 +70,7 @@ Future<void> main() async {
7670
final String objcPluginPath = path.join(tempDir.path, objcPluginName);
7771
final String objcPodspecPath = path.join(objcPluginPath, 'ios', '$objcPluginName.podspec');
7872
await inDirectory(tempDir, () async {
79-
await exec('pod', <String>[
80-
'lib',
81-
'lint',
82-
objcPodspecPath,
83-
'--allow-warnings',
84-
'--verbose',
85-
]);
73+
await exec('pod', <String>['lib', 'lint', objcPodspecPath, '--allow-warnings']);
8674
});
8775

8876
section('Lint Objective-C iOS podspec plugin as library');
@@ -94,7 +82,6 @@ Future<void> main() async {
9482
objcPodspecPath,
9583
'--allow-warnings',
9684
'--use-libraries',
97-
'--verbose',
9885
]);
9986
});
10087

@@ -120,13 +107,7 @@ Future<void> main() async {
120107
final String swiftPluginPath = path.join(tempDir.path, swiftPluginName);
121108
final String swiftPodspecPath = path.join(swiftPluginPath, 'ios', '$swiftPluginName.podspec');
122109
await inDirectory(tempDir, () async {
123-
await exec('pod', <String>[
124-
'lib',
125-
'lint',
126-
swiftPodspecPath,
127-
'--allow-warnings',
128-
'--verbose',
129-
]);
110+
await exec('pod', <String>['lib', 'lint', swiftPodspecPath, '--allow-warnings']);
130111
});
131112

132113
section('Lint Swift iOS podspec plugin as library');
@@ -138,7 +119,6 @@ Future<void> main() async {
138119
swiftPodspecPath,
139120
'--allow-warnings',
140121
'--use-libraries',
141-
'--verbose',
142122
]);
143123
});
144124

@@ -150,17 +130,13 @@ Future<void> main() async {
150130
'$swiftPluginName.podspec',
151131
);
152132
await inDirectory(tempDir, () async {
153-
await _tryMacOSLint(macOSPodspecPath, <String>['--allow-warnings', '--verbose']);
133+
await _tryMacOSLint(macOSPodspecPath, <String>['--allow-warnings']);
154134
});
155135

156136
section('Lint Swift macOS podspec plugin as library');
157137

158138
await inDirectory(tempDir, () async {
159-
await _tryMacOSLint(macOSPodspecPath, <String>[
160-
'--allow-warnings',
161-
'--use-libraries',
162-
'--verbose',
163-
]);
139+
await _tryMacOSLint(macOSPodspecPath, <String>['--allow-warnings', '--use-libraries']);
164140
});
165141

166142
section('Create Objective-C application');

0 commit comments

Comments
 (0)