Re-land #162644: Remove --verbose from devicelab task executions. (#163017)

Re-lands https://github.com/flutter/flutter/pull/162644.

Reverts 7569fbfce500f3859902984144855cb249de24ed, 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).
This commit is contained in:
Matan Lurey 2025-02-10 13:53:55 -08:00 committed by GitHub
parent 2e74a87461
commit dee15f56bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 20 additions and 76 deletions

View File

@ -22,7 +22,6 @@ Future<void> main() async {
'--target-platform=android-arm', '--target-platform=android-arm',
'--obfuscate', '--obfuscate',
'--split-debug-info=foo/', '--split-debug-info=foo/',
'--verbose',
], ],
); );
}); });
@ -67,7 +66,6 @@ Future<void> main() async {
'--split-debug-info=foo/', '--split-debug-info=foo/',
'--no-debug', '--no-debug',
'--no-profile', '--no-profile',
'--verbose',
], ],
); );
}); });

View File

@ -93,7 +93,7 @@ Future<void> main() async {
section('Build release AAR'); section('Build release AAR');
await inDirectory(projectDir, () async { await inDirectory(projectDir, () async {
await flutter('build', options: <String>['aar', '--verbose']); await flutter('build', options: <String>['aar']);
}); });
final String repoPath = path.join(projectDir.path, 'build', 'host', 'outputs', 'repo'); final String repoPath = path.join(projectDir.path, 'build', 'host', 'outputs', 'repo');

View File

@ -85,7 +85,6 @@ Future<void> _testBuildIosFramework(Directory projectDir, {bool isModule = false
'build', 'build',
options: <String>[ options: <String>[
'ios-framework', 'ios-framework',
'--verbose',
'--output=$outputDirectoryName', '--output=$outputDirectoryName',
'--obfuscate', '--obfuscate',
'--split-debug-info=symbols', '--split-debug-info=symbols',
@ -470,7 +469,6 @@ Future<void> _testBuildMacOSFramework(Directory projectDir) async {
'build', 'build',
options: <String>[ options: <String>[
'macos-framework', 'macos-framework',
'--verbose',
'--output=$outputDirectoryName', '--output=$outputDirectoryName',
'--obfuscate', '--obfuscate',
'--split-debug-info=symbols', '--split-debug-info=symbols',

View File

@ -44,7 +44,7 @@ class NewGalleryChromeRunTest {
await flutter('build', options: <String>['web', '-v', '--release', '--no-pub']); await flutter('build', options: <String>['web', '-v', '--release', '--no-pub']);
final List<String> options = <String>['-d', 'chrome', '--verbose', '--resident']; final List<String> options = <String>['-d', 'chrome', '--resident'];
final Process process = await startFlutter('run', options: options); final Process process = await startFlutter('run', options: options);
final Completer<void> stdoutDone = Completer<void>(); final Completer<void> stdoutDone = Completer<void>();

View File

@ -81,10 +81,7 @@ Future<void> main() async {
section('Build app bundle using the flutter tool - flavor: flavor_underscore'); section('Build app bundle using the flutter tool - flavor: flavor_underscore');
int exitCode = await inDirectory(project.rootPath, () { int exitCode = await inDirectory(project.rootPath, () {
return flutter( return flutter('build', options: <String>['appbundle', '--flavor=flavor_underscore']);
'build',
options: <String>['appbundle', '--flavor=flavor_underscore', '--verbose'],
);
}); });
if (exitCode != 0) { if (exitCode != 0) {
@ -114,10 +111,7 @@ Future<void> main() async {
section('Build app bundle using the flutter tool - flavor: production'); section('Build app bundle using the flutter tool - flavor: production');
exitCode = await inDirectory(project.rootPath, () { exitCode = await inDirectory(project.rootPath, () {
return flutter( return flutter('build', options: <String>['appbundle', '--flavor=production']);
'build',
options: <String>['appbundle', '--flavor=production', '--verbose'],
);
}); });
if (exitCode != 0) { if (exitCode != 0) {

View File

@ -16,7 +16,7 @@ Future<void> main() async {
await runPluginProjectTest((FlutterPluginProject pluginProject) async { await runPluginProjectTest((FlutterPluginProject pluginProject) async {
section('APK content for task assembleDebug without explicit target platform'); section('APK content for task assembleDebug without explicit target platform');
await inDirectory(pluginProject.exampleAndroidPath, () { await inDirectory(pluginProject.exampleAndroidPath, () {
return flutter('build', options: <String>['apk', '--debug', '--verbose']); return flutter('build', options: <String>['apk', '--debug']);
}); });
Iterable<String> apkFiles = await getFilesInApk(pluginProject.debugApkPath); 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'); section('APK content for task assembleRelease without explicit target platform');
await inDirectory(pluginProject.exampleAndroidPath, () { await inDirectory(pluginProject.exampleAndroidPath, () {
return flutter('build', options: <String>['apk', '--release', '--verbose']); return flutter('build', options: <String>['apk', '--release']);
}); });
apkFiles = await getFilesInApk(pluginProject.releaseApkPath); apkFiles = await getFilesInApk(pluginProject.releaseApkPath);
@ -67,12 +67,7 @@ Future<void> main() async {
await inDirectory(pluginProject.exampleAndroidPath, () { await inDirectory(pluginProject.exampleAndroidPath, () {
return flutter( return flutter(
'build', 'build',
options: <String>[ options: <String>['apk', '--release', '--target-platform=android-arm,android-arm64'],
'apk',
'--release',
'--verbose',
'--target-platform=android-arm,android-arm64',
],
); );
}); });
@ -100,7 +95,6 @@ Future<void> main() async {
options: <String>[ options: <String>[
'apk', 'apk',
'--release', '--release',
'--verbose',
'--split-per-abi', '--split-per-abi',
'--target-platform=android-arm,android-arm64', '--target-platform=android-arm,android-arm64',
], ],
@ -136,7 +130,7 @@ Future<void> main() async {
section('gradlew assembleRelease'); section('gradlew assembleRelease');
await inDirectory(project.rootPath, () { await inDirectory(project.rootPath, () {
return flutter('build', options: <String>['apk', '--release', '--verbose']); return flutter('build', options: <String>['apk', '--release']);
}); });
// When the platform-target isn't specified, we generate the snapshots // When the platform-target isn't specified, we generate the snapshots

View File

@ -21,7 +21,7 @@ class HelloWorldMemoryTest extends MemoryTest {
print('launching $project$test on device...'); print('launching $project$test on device...');
await flutter( await flutter(
'run', 'run',
options: <String>['--verbose', '--release', '--no-resident', '-d', device!.deviceId, test], options: <String>['--release', '--no-resident', '-d', device!.deviceId, test],
); );
await Future<void>.delayed(const Duration(milliseconds: 1500)); await Future<void>.delayed(const Duration(milliseconds: 1500));
await recordStart(); await recordStart();

View File

@ -85,7 +85,7 @@ dependencies:
section('Build ephemeral host app in release mode without CocoaPods'); section('Build ephemeral host app in release mode without CocoaPods');
await inDirectory(projectDir, () async { await inDirectory(projectDir, () async {
await flutter('build', options: <String>['ios', '--no-codesign', '--verbose']); await flutter('build', options: <String>['ios', '--no-codesign']);
}); });
// Check the tool is no longer copying to the legacy xcframework location. // Check the tool is no longer copying to the legacy xcframework location.
@ -606,7 +606,7 @@ end
); );
if (!xcodebuildOutput.contains( if (!xcodebuildOutput.contains(
'flutter --verbose --local-engine-src-path=bogus assemble', RegExp('flutter.*--local-engine-src-path=bogus assemble'),
) || // Verbose output ) || // Verbose output
!xcodebuildOutput.contains( !xcodebuildOutput.contains(
'Unable to detect a Flutter engine build directory in bogus', 'Unable to detect a Flutter engine build directory in bogus',

View File

@ -280,7 +280,7 @@ public class DummyPluginAClass {
section('Build plugin A example iOS app'); section('Build plugin A example iOS app');
await inDirectory(exampleApp, () async { await inDirectory(exampleApp, () async {
await evalFlutter('build', options: <String>['ios', '--no-codesign', '--verbose']); await evalFlutter('build', options: <String>['ios', '--no-codesign']);
}); });
final Directory appBundle = Directory( final Directory appBundle = Directory(

View File

@ -37,13 +37,7 @@ Future<void> main() async {
'integration_test.podspec', 'integration_test.podspec',
); );
await exec('pod', <String>[ await exec('pod', <String>['lib', 'lint', iosintegrationTestPodspec, '--use-libraries']);
'lib',
'lint',
iosintegrationTestPodspec,
'--use-libraries',
'--verbose',
]);
final String macosintegrationTestPodspec = path.join( final String macosintegrationTestPodspec = path.join(
integrationTestPackage, integrationTestPackage,
@ -51,7 +45,7 @@ Future<void> main() async {
'macos', 'macos',
'integration_test_macos.podspec', 'integration_test_macos.podspec',
); );
await _tryMacOSLint(macosintegrationTestPodspec, <String>['--verbose']); await _tryMacOSLint(macosintegrationTestPodspec, <String>[]);
}); });
section('Create Objective-C plugin'); section('Create Objective-C plugin');
@ -76,13 +70,7 @@ Future<void> main() async {
final String objcPluginPath = path.join(tempDir.path, objcPluginName); final String objcPluginPath = path.join(tempDir.path, objcPluginName);
final String objcPodspecPath = path.join(objcPluginPath, 'ios', '$objcPluginName.podspec'); final String objcPodspecPath = path.join(objcPluginPath, 'ios', '$objcPluginName.podspec');
await inDirectory(tempDir, () async { await inDirectory(tempDir, () async {
await exec('pod', <String>[ await exec('pod', <String>['lib', 'lint', objcPodspecPath, '--allow-warnings']);
'lib',
'lint',
objcPodspecPath,
'--allow-warnings',
'--verbose',
]);
}); });
section('Lint Objective-C iOS podspec plugin as library'); section('Lint Objective-C iOS podspec plugin as library');
@ -94,7 +82,6 @@ Future<void> main() async {
objcPodspecPath, objcPodspecPath,
'--allow-warnings', '--allow-warnings',
'--use-libraries', '--use-libraries',
'--verbose',
]); ]);
}); });
@ -120,13 +107,7 @@ Future<void> main() async {
final String swiftPluginPath = path.join(tempDir.path, swiftPluginName); final String swiftPluginPath = path.join(tempDir.path, swiftPluginName);
final String swiftPodspecPath = path.join(swiftPluginPath, 'ios', '$swiftPluginName.podspec'); final String swiftPodspecPath = path.join(swiftPluginPath, 'ios', '$swiftPluginName.podspec');
await inDirectory(tempDir, () async { await inDirectory(tempDir, () async {
await exec('pod', <String>[ await exec('pod', <String>['lib', 'lint', swiftPodspecPath, '--allow-warnings']);
'lib',
'lint',
swiftPodspecPath,
'--allow-warnings',
'--verbose',
]);
}); });
section('Lint Swift iOS podspec plugin as library'); section('Lint Swift iOS podspec plugin as library');
@ -138,7 +119,6 @@ Future<void> main() async {
swiftPodspecPath, swiftPodspecPath,
'--allow-warnings', '--allow-warnings',
'--use-libraries', '--use-libraries',
'--verbose',
]); ]);
}); });
@ -150,17 +130,13 @@ Future<void> main() async {
'$swiftPluginName.podspec', '$swiftPluginName.podspec',
); );
await inDirectory(tempDir, () async { await inDirectory(tempDir, () async {
await _tryMacOSLint(macOSPodspecPath, <String>['--allow-warnings', '--verbose']); await _tryMacOSLint(macOSPodspecPath, <String>['--allow-warnings']);
}); });
section('Lint Swift macOS podspec plugin as library'); section('Lint Swift macOS podspec plugin as library');
await inDirectory(tempDir, () async { await inDirectory(tempDir, () async {
await _tryMacOSLint(macOSPodspecPath, <String>[ await _tryMacOSLint(macOSPodspecPath, <String>['--allow-warnings', '--use-libraries']);
'--allow-warnings',
'--use-libraries',
'--verbose',
]);
}); });
section('Create Objective-C application'); section('Create Objective-C application');

View File

@ -20,14 +20,7 @@ void main() {
await inDirectory(appDir, () async { await inDirectory(appDir, () async {
return flutter( return flutter(
'drive', 'drive',
options: <String>[ options: <String>['-d', device.deviceId, '--route', '/smuggle-it', 'lib/route.dart'],
'--verbose',
'-d',
device.deviceId,
'--route',
'/smuggle-it',
'lib/route.dart',
],
); );
}); });
return TaskResult.success(null); return TaskResult.success(null);

View File

@ -23,14 +23,7 @@ void main() {
await inDirectory(appDir, () async { await inDirectory(appDir, () async {
return flutter( return flutter(
'drive', 'drive',
options: <String>[ options: <String>['-d', device.deviceId, '--route', '/smuggle-it', 'lib/route.dart'],
'--verbose',
'-d',
device.deviceId,
'--route',
'/smuggle-it',
'lib/route.dart',
],
); );
}); });
section('TEST WHETHER `flutter run --route` WORKS'); section('TEST WHETHER `flutter run --route` WORKS');
@ -42,7 +35,6 @@ void main() {
'run', 'run',
// --fast-start does not support routes. // --fast-start does not support routes.
options: <String>[ options: <String>[
'--verbose',
'--disable-service-auth-codes', '--disable-service-auth-codes',
'--no-fast-start', '--no-fast-start',
'--no-publish-port', '--no-publish-port',

View File

@ -28,7 +28,6 @@ void main() {
final Process run = await startFlutter( final Process run = await startFlutter(
'run', 'run',
options: <String>[ options: <String>[
'--verbose',
'--no-fast-start', '--no-fast-start',
'--no-publish-port', '--no-publish-port',
'--disable-service-auth-codes', '--disable-service-auth-codes',