From 7569fbfce500f3859902984144855cb249de24ed Mon Sep 17 00:00:00 2001
From: "auto-submit[bot]" <98614782+auto-submit[bot]@users.noreply.github.com>
Date: Fri, 7 Feb 2025 01:27:47 +0000
Subject: [PATCH] Reverts "Remove `--verbose` from devicelab task executions.
 (#162644)" (#162853)

<!-- start_original_pr_link -->
Reverts: flutter/flutter#162644
<!-- end_original_pr_link -->
<!-- start_initiating_author -->
Initiated by: matanlurey
<!-- end_initiating_author -->
<!-- start_revert_reason -->
Reason for reverting: At least one post-submit test depends on the
output of `--verbose`.
<!-- end_revert_reason -->
<!-- start_original_pr_author -->
Original PR Author: matanlurey
<!-- end_original_pr_author -->

<!-- start_reviewers -->
Reviewed By: {cbracken, reidbaker, jonahwilliams}
<!-- end_reviewers -->

<!-- start_revert_body -->
This change reverts the following previous change:
These can be useful, but were probably left in past the point where they
are always useful:

- https://github.com/flutter/flutter/pull/58018
- https://github.com/flutter/flutter/pull/56342
- https://github.com/flutter/flutter/pull/74080

... compared to the cost of reading these logs with 1000s of lines of
`stdout: ` output.

Will ask the CI gods if any of this was load-bearing before sending out
for review.
<!-- end_revert_body -->

Co-authored-by: auto-submit[bot] <flutter-engprod-team@google.com>
---
 .../bin/tasks/android_obfuscate_test.dart     |  2 ++
 .../bin/tasks/build_aar_module_test.dart      |  2 +-
 .../build_ios_framework_module_test.dart      |  2 ++
 .../flutter_gallery_v2_chrome_run_test.dart   |  2 +-
 .../bin/tasks/gradle_plugin_bundle_test.dart  | 10 ++++--
 .../bin/tasks/gradle_plugin_fat_apk_test.dart | 14 +++++---
 .../bin/tasks/hello_world__memory.dart        |  2 +-
 .../tasks/ios_app_with_extensions_test.dart   |  2 +-
 dev/devicelab/bin/tasks/module_test_ios.dart  |  4 +--
 .../bin/tasks/plugin_dependencies_test.dart   |  2 +-
 dev/devicelab/bin/tasks/plugin_lint_mac.dart  | 36 +++++++++++++++----
 dev/devicelab/bin/tasks/route_test_ios.dart   |  9 ++++-
 dev/devicelab/bin/tasks/routing_test.dart     | 10 +++++-
 .../bin/tasks/service_extensions_test.dart    |  1 +
 14 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/dev/devicelab/bin/tasks/android_obfuscate_test.dart b/dev/devicelab/bin/tasks/android_obfuscate_test.dart
index 42c0d417c8..e5f9ec0dd0 100644
--- a/dev/devicelab/bin/tasks/android_obfuscate_test.dart
+++ b/dev/devicelab/bin/tasks/android_obfuscate_test.dart
@@ -22,6 +22,7 @@ Future<void> main() async {
               '--target-platform=android-arm',
               '--obfuscate',
               '--split-debug-info=foo/',
+              '--verbose',
             ],
           );
         });
@@ -66,6 +67,7 @@ Future<void> main() async {
               '--split-debug-info=foo/',
               '--no-debug',
               '--no-profile',
+              '--verbose',
             ],
           );
         });
diff --git a/dev/devicelab/bin/tasks/build_aar_module_test.dart b/dev/devicelab/bin/tasks/build_aar_module_test.dart
index 87afc53bb8..37b4c25b51 100644
--- a/dev/devicelab/bin/tasks/build_aar_module_test.dart
+++ b/dev/devicelab/bin/tasks/build_aar_module_test.dart
@@ -93,7 +93,7 @@ Future<void> main() async {
       section('Build release AAR');
 
       await inDirectory(projectDir, () async {
-        await flutter('build', options: <String>['aar']);
+        await flutter('build', options: <String>['aar', '--verbose']);
       });
 
       final String repoPath = path.join(projectDir.path, 'build', 'host', 'outputs', 'repo');
diff --git a/dev/devicelab/bin/tasks/build_ios_framework_module_test.dart b/dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
index 09a9423959..b50af7ba10 100644
--- a/dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
+++ b/dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
@@ -85,6 +85,7 @@ Future<void> _testBuildIosFramework(Directory projectDir, {bool isModule = false
       'build',
       options: <String>[
         'ios-framework',
+        '--verbose',
         '--output=$outputDirectoryName',
         '--obfuscate',
         '--split-debug-info=symbols',
@@ -469,6 +470,7 @@ Future<void> _testBuildMacOSFramework(Directory projectDir) async {
       'build',
       options: <String>[
         'macos-framework',
+        '--verbose',
         '--output=$outputDirectoryName',
         '--obfuscate',
         '--split-debug-info=symbols',
diff --git a/dev/devicelab/bin/tasks/flutter_gallery_v2_chrome_run_test.dart b/dev/devicelab/bin/tasks/flutter_gallery_v2_chrome_run_test.dart
index 99dcf5ec56..d2d1e25a82 100644
--- a/dev/devicelab/bin/tasks/flutter_gallery_v2_chrome_run_test.dart
+++ b/dev/devicelab/bin/tasks/flutter_gallery_v2_chrome_run_test.dart
@@ -44,7 +44,7 @@ class NewGalleryChromeRunTest {
 
         await flutter('build', options: <String>['web', '-v', '--release', '--no-pub']);
 
-        final List<String> options = <String>['-d', 'chrome', '--resident'];
+        final List<String> options = <String>['-d', 'chrome', '--verbose', '--resident'];
         final Process process = await startFlutter('run', options: options);
 
         final Completer<void> stdoutDone = Completer<void>();
diff --git a/dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart b/dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart
index 34edcf0377..532205490d 100644
--- a/dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart
+++ b/dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart
@@ -81,7 +81,10 @@ Future<void> main() async {
         section('Build app bundle using the flutter tool - flavor: flavor_underscore');
 
         int exitCode = await inDirectory(project.rootPath, () {
-          return flutter('build', options: <String>['appbundle', '--flavor=flavor_underscore']);
+          return flutter(
+            'build',
+            options: <String>['appbundle', '--flavor=flavor_underscore', '--verbose'],
+          );
         });
 
         if (exitCode != 0) {
@@ -111,7 +114,10 @@ Future<void> main() async {
         section('Build app bundle using the flutter tool - flavor: production');
 
         exitCode = await inDirectory(project.rootPath, () {
-          return flutter('build', options: <String>['appbundle', '--flavor=production']);
+          return flutter(
+            'build',
+            options: <String>['appbundle', '--flavor=production', '--verbose'],
+          );
         });
 
         if (exitCode != 0) {
diff --git a/dev/devicelab/bin/tasks/gradle_plugin_fat_apk_test.dart b/dev/devicelab/bin/tasks/gradle_plugin_fat_apk_test.dart
index 50b3be1c3e..416f05c1d6 100644
--- a/dev/devicelab/bin/tasks/gradle_plugin_fat_apk_test.dart
+++ b/dev/devicelab/bin/tasks/gradle_plugin_fat_apk_test.dart
@@ -16,7 +16,7 @@ Future<void> main() async {
       await runPluginProjectTest((FlutterPluginProject pluginProject) async {
         section('APK content for task assembleDebug without explicit target platform');
         await inDirectory(pluginProject.exampleAndroidPath, () {
-          return flutter('build', options: <String>['apk', '--debug']);
+          return flutter('build', options: <String>['apk', '--debug', '--verbose']);
         });
 
         Iterable<String> apkFiles = await getFilesInApk(pluginProject.debugApkPath);
@@ -42,7 +42,7 @@ Future<void> main() async {
         section('APK content for task assembleRelease without explicit target platform');
 
         await inDirectory(pluginProject.exampleAndroidPath, () {
-          return flutter('build', options: <String>['apk', '--release']);
+          return flutter('build', options: <String>['apk', '--release', '--verbose']);
         });
 
         apkFiles = await getFilesInApk(pluginProject.releaseApkPath);
@@ -67,7 +67,12 @@ Future<void> main() async {
         await inDirectory(pluginProject.exampleAndroidPath, () {
           return flutter(
             'build',
-            options: <String>['apk', '--release', '--target-platform=android-arm,android-arm64'],
+            options: <String>[
+              'apk',
+              '--release',
+              '--verbose',
+              '--target-platform=android-arm,android-arm64',
+            ],
           );
         });
 
@@ -95,6 +100,7 @@ Future<void> main() async {
             options: <String>[
               'apk',
               '--release',
+              '--verbose',
               '--split-per-abi',
               '--target-platform=android-arm,android-arm64',
             ],
@@ -130,7 +136,7 @@ Future<void> main() async {
         section('gradlew assembleRelease');
 
         await inDirectory(project.rootPath, () {
-          return flutter('build', options: <String>['apk', '--release']);
+          return flutter('build', options: <String>['apk', '--release', '--verbose']);
         });
 
         // When the platform-target isn't specified, we generate the snapshots
diff --git a/dev/devicelab/bin/tasks/hello_world__memory.dart b/dev/devicelab/bin/tasks/hello_world__memory.dart
index f2d294e917..46d5dc8c12 100644
--- a/dev/devicelab/bin/tasks/hello_world__memory.dart
+++ b/dev/devicelab/bin/tasks/hello_world__memory.dart
@@ -21,7 +21,7 @@ class HelloWorldMemoryTest extends MemoryTest {
     print('launching $project$test on device...');
     await flutter(
       'run',
-      options: <String>['--release', '--no-resident', '-d', device!.deviceId, test],
+      options: <String>['--verbose', '--release', '--no-resident', '-d', device!.deviceId, test],
     );
     await Future<void>.delayed(const Duration(milliseconds: 1500));
     await recordStart();
diff --git a/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart b/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart
index 973dab2c1f..c34eadb4ee 100644
--- a/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart
+++ b/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart
@@ -35,7 +35,7 @@ Future<void> main() async {
       await inDirectory(projectDir, () async {
         final String buildOutput = await evalFlutter(
           'build',
-          options: <String>['ios', '--no-codesign', '--release'],
+          options: <String>['ios', '--no-codesign', '--release', '--verbose'],
         );
         if (!buildOutput.contains('-destination generic/platform=watchOS')) {
           print(buildOutput);
diff --git a/dev/devicelab/bin/tasks/module_test_ios.dart b/dev/devicelab/bin/tasks/module_test_ios.dart
index db70d0833a..4d26365602 100644
--- a/dev/devicelab/bin/tasks/module_test_ios.dart
+++ b/dev/devicelab/bin/tasks/module_test_ios.dart
@@ -85,7 +85,7 @@ dependencies:
       section('Build ephemeral host app in release mode without CocoaPods');
 
       await inDirectory(projectDir, () async {
-        await flutter('build', options: <String>['ios', '--no-codesign']);
+        await flutter('build', options: <String>['ios', '--no-codesign', '--verbose']);
       });
 
       // Check the tool is no longer copying to the legacy xcframework location.
@@ -606,7 +606,7 @@ end
       );
 
       if (!xcodebuildOutput.contains(
-            RegExp('flutter.*--local-engine-src-path=bogus assemble'),
+            'flutter --verbose --local-engine-src-path=bogus assemble',
           ) || // Verbose output
           !xcodebuildOutput.contains(
             'Unable to detect a Flutter engine build directory in bogus',
diff --git a/dev/devicelab/bin/tasks/plugin_dependencies_test.dart b/dev/devicelab/bin/tasks/plugin_dependencies_test.dart
index 9f8e40a426..aed7451ad0 100644
--- a/dev/devicelab/bin/tasks/plugin_dependencies_test.dart
+++ b/dev/devicelab/bin/tasks/plugin_dependencies_test.dart
@@ -280,7 +280,7 @@ public class DummyPluginAClass {
         section('Build plugin A example iOS app');
 
         await inDirectory(exampleApp, () async {
-          await evalFlutter('build', options: <String>['ios', '--no-codesign']);
+          await evalFlutter('build', options: <String>['ios', '--no-codesign', '--verbose']);
         });
 
         final Directory appBundle = Directory(
diff --git a/dev/devicelab/bin/tasks/plugin_lint_mac.dart b/dev/devicelab/bin/tasks/plugin_lint_mac.dart
index 807f2d2088..3c9b50eb15 100644
--- a/dev/devicelab/bin/tasks/plugin_lint_mac.dart
+++ b/dev/devicelab/bin/tasks/plugin_lint_mac.dart
@@ -37,7 +37,13 @@ Future<void> main() async {
           'integration_test.podspec',
         );
 
-        await exec('pod', <String>['lib', 'lint', iosintegrationTestPodspec, '--use-libraries']);
+        await exec('pod', <String>[
+          'lib',
+          'lint',
+          iosintegrationTestPodspec,
+          '--use-libraries',
+          '--verbose',
+        ]);
 
         final String macosintegrationTestPodspec = path.join(
           integrationTestPackage,
@@ -45,7 +51,7 @@ Future<void> main() async {
           'macos',
           'integration_test_macos.podspec',
         );
-        await _tryMacOSLint(macosintegrationTestPodspec, <String>[]);
+        await _tryMacOSLint(macosintegrationTestPodspec, <String>['--verbose']);
       });
 
       section('Create Objective-C plugin');
@@ -70,7 +76,13 @@ Future<void> main() async {
       final String objcPluginPath = path.join(tempDir.path, objcPluginName);
       final String objcPodspecPath = path.join(objcPluginPath, 'ios', '$objcPluginName.podspec');
       await inDirectory(tempDir, () async {
-        await exec('pod', <String>['lib', 'lint', objcPodspecPath, '--allow-warnings']);
+        await exec('pod', <String>[
+          'lib',
+          'lint',
+          objcPodspecPath,
+          '--allow-warnings',
+          '--verbose',
+        ]);
       });
 
       section('Lint Objective-C iOS podspec plugin as library');
@@ -82,6 +94,7 @@ Future<void> main() async {
           objcPodspecPath,
           '--allow-warnings',
           '--use-libraries',
+          '--verbose',
         ]);
       });
 
@@ -107,7 +120,13 @@ Future<void> main() async {
       final String swiftPluginPath = path.join(tempDir.path, swiftPluginName);
       final String swiftPodspecPath = path.join(swiftPluginPath, 'ios', '$swiftPluginName.podspec');
       await inDirectory(tempDir, () async {
-        await exec('pod', <String>['lib', 'lint', swiftPodspecPath, '--allow-warnings']);
+        await exec('pod', <String>[
+          'lib',
+          'lint',
+          swiftPodspecPath,
+          '--allow-warnings',
+          '--verbose',
+        ]);
       });
 
       section('Lint Swift iOS podspec plugin as library');
@@ -119,6 +138,7 @@ Future<void> main() async {
           swiftPodspecPath,
           '--allow-warnings',
           '--use-libraries',
+          '--verbose',
         ]);
       });
 
@@ -130,13 +150,17 @@ Future<void> main() async {
         '$swiftPluginName.podspec',
       );
       await inDirectory(tempDir, () async {
-        await _tryMacOSLint(macOSPodspecPath, <String>['--allow-warnings']);
+        await _tryMacOSLint(macOSPodspecPath, <String>['--allow-warnings', '--verbose']);
       });
 
       section('Lint Swift macOS podspec plugin as library');
 
       await inDirectory(tempDir, () async {
-        await _tryMacOSLint(macOSPodspecPath, <String>['--allow-warnings', '--use-libraries']);
+        await _tryMacOSLint(macOSPodspecPath, <String>[
+          '--allow-warnings',
+          '--use-libraries',
+          '--verbose',
+        ]);
       });
 
       section('Create Objective-C application');
diff --git a/dev/devicelab/bin/tasks/route_test_ios.dart b/dev/devicelab/bin/tasks/route_test_ios.dart
index 21eea5726c..4ba3b42fc1 100644
--- a/dev/devicelab/bin/tasks/route_test_ios.dart
+++ b/dev/devicelab/bin/tasks/route_test_ios.dart
@@ -20,7 +20,14 @@ void main() {
     await inDirectory(appDir, () async {
       return flutter(
         'drive',
-        options: <String>['-d', device.deviceId, '--route', '/smuggle-it', 'lib/route.dart'],
+        options: <String>[
+          '--verbose',
+          '-d',
+          device.deviceId,
+          '--route',
+          '/smuggle-it',
+          'lib/route.dart',
+        ],
       );
     });
     return TaskResult.success(null);
diff --git a/dev/devicelab/bin/tasks/routing_test.dart b/dev/devicelab/bin/tasks/routing_test.dart
index d31c0354eb..c6df7fd029 100644
--- a/dev/devicelab/bin/tasks/routing_test.dart
+++ b/dev/devicelab/bin/tasks/routing_test.dart
@@ -23,7 +23,14 @@ void main() {
     await inDirectory(appDir, () async {
       return flutter(
         'drive',
-        options: <String>['-d', device.deviceId, '--route', '/smuggle-it', 'lib/route.dart'],
+        options: <String>[
+          '--verbose',
+          '-d',
+          device.deviceId,
+          '--route',
+          '/smuggle-it',
+          'lib/route.dart',
+        ],
       );
     });
     section('TEST WHETHER `flutter run --route` WORKS');
@@ -35,6 +42,7 @@ void main() {
         'run',
         // --fast-start does not support routes.
         options: <String>[
+          '--verbose',
           '--disable-service-auth-codes',
           '--no-fast-start',
           '--no-publish-port',
diff --git a/dev/devicelab/bin/tasks/service_extensions_test.dart b/dev/devicelab/bin/tasks/service_extensions_test.dart
index 74eb34433e..cc4f01cc71 100644
--- a/dev/devicelab/bin/tasks/service_extensions_test.dart
+++ b/dev/devicelab/bin/tasks/service_extensions_test.dart
@@ -28,6 +28,7 @@ void main() {
       final Process run = await startFlutter(
         'run',
         options: <String>[
+          '--verbose',
           '--no-fast-start',
           '--no-publish-port',
           '--disable-service-auth-codes',