diff --git a/dev/bots/suite_runners/run_add_to_app_life_cycle_tests.dart b/dev/bots/suite_runners/run_add_to_app_life_cycle_tests.dart index 7e9ff835db..a97db0c75f 100644 --- a/dev/bots/suite_runners/run_add_to_app_life_cycle_tests.dart +++ b/dev/bots/suite_runners/run_add_to_app_life_cycle_tests.dart @@ -9,7 +9,7 @@ import 'package:path/path.dart' as path; import '../run_command.dart'; import '../utils.dart'; -Future addToAppLifeCycleRunner(String flutterRoot) async { +Future addToAppLifeCycleRunner() async { if (Platform.isMacOS) { printProgress('${green}Running add-to-app life cycle iOS integration tests$reset...'); final String addToAppDir = path.join(flutterRoot, 'dev', 'integration_tests', 'ios_add2app_life_cycle'); diff --git a/dev/bots/suite_runners/run_analyze_tests.dart b/dev/bots/suite_runners/run_analyze_tests.dart index 0a6a226d88..77ffc2f66f 100644 --- a/dev/bots/suite_runners/run_analyze_tests.dart +++ b/dev/bots/suite_runners/run_analyze_tests.dart @@ -7,7 +7,7 @@ import 'package:path/path.dart' as path; import '../run_command.dart'; import '../utils.dart'; -Future analyzeRunner(String flutterRoot) async { +Future analyzeRunner() async { printProgress('${green}Running analysis testing$reset'); await runCommand( 'dart', diff --git a/dev/bots/suite_runners/run_customer_testing_tests.dart b/dev/bots/suite_runners/run_customer_testing_tests.dart index d2e8e45e04..adb3ff36c1 100644 --- a/dev/bots/suite_runners/run_customer_testing_tests.dart +++ b/dev/bots/suite_runners/run_customer_testing_tests.dart @@ -9,7 +9,7 @@ import 'package:path/path.dart' as path; import '../run_command.dart'; import '../utils.dart'; -Future customerTestingRunner(String flutterRoot) async { +Future customerTestingRunner() async { printProgress('${green}Running customer testing$reset'); await runCommand( 'git', diff --git a/dev/bots/suite_runners/run_docs_tests.dart b/dev/bots/suite_runners/run_docs_tests.dart index 729ca0b614..dec0a84527 100644 --- a/dev/bots/suite_runners/run_docs_tests.dart +++ b/dev/bots/suite_runners/run_docs_tests.dart @@ -5,7 +5,7 @@ import '../run_command.dart'; import '../utils.dart'; -Future docsRunner(String flutterRoot) async { +Future docsRunner() async { printProgress('${green}Running flutter doc tests$reset'); await runCommand( './dev/bots/docs.sh', diff --git a/dev/bots/suite_runners/run_flutter_packages_tests.dart b/dev/bots/suite_runners/run_flutter_packages_tests.dart index 74de7a6387..e5605da804 100644 --- a/dev/bots/suite_runners/run_flutter_packages_tests.dart +++ b/dev/bots/suite_runners/run_flutter_packages_tests.dart @@ -12,7 +12,7 @@ import '../run_command.dart'; import '../utils.dart'; /// Executes the test suite for the flutter/packages repo. -Future flutterPackagesRunner(String flutterRoot) async { +Future flutterPackagesRunner() async { Future runAnalyze() async { printProgress('${green}Running analysis for flutter/packages$reset'); diff --git a/dev/bots/suite_runners/run_fuchsia_precache.dart b/dev/bots/suite_runners/run_fuchsia_precache.dart index 2d55f6504e..364cf7c50b 100644 --- a/dev/bots/suite_runners/run_fuchsia_precache.dart +++ b/dev/bots/suite_runners/run_fuchsia_precache.dart @@ -6,7 +6,7 @@ import '../run_command.dart'; import '../utils.dart'; // Runs flutter_precache. -Future fuchsiaPrecacheRunner(String flutterRoot) async { +Future fuchsiaPrecacheRunner() async { printProgress('${green}Running flutter precache tests$reset'); await runCommand( 'flutter', diff --git a/dev/bots/suite_runners/run_realm_checker_tests.dart b/dev/bots/suite_runners/run_realm_checker_tests.dart index 398054fdd7..f4f78e7aab 100644 --- a/dev/bots/suite_runners/run_realm_checker_tests.dart +++ b/dev/bots/suite_runners/run_realm_checker_tests.dart @@ -8,7 +8,7 @@ import 'package:path/path.dart' as path; import '../utils.dart'; -Future realmCheckerTestRunner(String flutterRoot) async { +Future realmCheckerTestRunner() async { final String engineRealmFile = path.join(flutterRoot, 'bin', 'internal', 'engine.realm'); final String engineRealm = File(engineRealmFile).readAsStringSync().trim(); diff --git a/dev/bots/suite_runners/run_verify_binaries_codesigned_tests.dart b/dev/bots/suite_runners/run_verify_binaries_codesigned_tests.dart index 4c4534a8f7..df49e68a0c 100644 --- a/dev/bots/suite_runners/run_verify_binaries_codesigned_tests.dart +++ b/dev/bots/suite_runners/run_verify_binaries_codesigned_tests.dart @@ -12,7 +12,7 @@ import 'package:process/process.dart'; import '../run_command.dart'; import '../utils.dart'; -Future verifyCodesignedTestRunner(String flutterRoot) async { +Future verifyCodesignedTestRunner() async { printProgress('${green}Running binaries codesign verification$reset'); await runCommand( 'flutter', diff --git a/dev/bots/suite_runners/run_web_tests.dart b/dev/bots/suite_runners/run_web_tests.dart index e4ce28eee1..d1ce7001d3 100644 --- a/dev/bots/suite_runners/run_web_tests.dart +++ b/dev/bots/suite_runners/run_web_tests.dart @@ -17,7 +17,7 @@ typedef ShardRunner = Future Function(); class WebTestsSuite { - WebTestsSuite(this.flutterRoot, this.flutterTestArgs); + WebTestsSuite(this.flutterTestArgs); /// Tests that we don't run on Web. /// @@ -87,7 +87,6 @@ class WebTestsSuite { static const List _kAllBuildModes = ['debug', 'profile', 'release']; - final String flutterRoot; final List flutterTestArgs; /// Coarse-grained integration tests running on the Web. diff --git a/dev/bots/test.dart b/dev/bots/test.dart index c1a8dc5c50..3341861fc5 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -136,9 +136,9 @@ Future main(List args) async { if (Platform.environment.containsKey(CIRRUS_TASK_NAME)) { printProgress('Running task: ${Platform.environment[CIRRUS_TASK_NAME]}'); } - final WebTestsSuite webTestsSuite = WebTestsSuite(flutterRoot, flutterTestArgs); + final WebTestsSuite webTestsSuite = WebTestsSuite(flutterTestArgs); await selectShard({ - 'add_to_app_life_cycle_tests': () => addToAppLifeCycleRunner(flutterRoot), + 'add_to_app_life_cycle_tests': addToAppLifeCycleRunner, 'build_tests': _runBuildTests, 'framework_coverage': frameworkCoverageRunner, 'framework_tests': _runFrameworkTests, @@ -156,14 +156,14 @@ Future main(List args) async { 'web_skwasm_tests': webTestsSuite.runWebSkwasmUnitTests, // All web integration tests 'web_long_running_tests': webTestsSuite.webLongRunningTestsRunner, - 'flutter_plugins': () => flutterPackagesRunner(flutterRoot), + 'flutter_plugins': flutterPackagesRunner, 'skp_generator': skpGeneratorTestsRunner, - 'realm_checker': () => realmCheckerTestRunner(flutterRoot), - 'customer_testing': () => customerTestingRunner(flutterRoot), - 'analyze': () => analyzeRunner(flutterRoot), - 'fuchsia_precache': () => fuchsiaPrecacheRunner(flutterRoot), - 'docs': () => docsRunner(flutterRoot), - 'verify_binaries_codesigned': () => verifyCodesignedTestRunner(flutterRoot), + 'realm_checker': realmCheckerTestRunner, + 'customer_testing': customerTestingRunner, + 'analyze': analyzeRunner, + 'fuchsia_precache': fuchsiaPrecacheRunner, + 'docs': docsRunner, + 'verify_binaries_codesigned': verifyCodesignedTestRunner, kTestHarnessShardName: _runTestHarnessTests, // Used for testing this script; also run as part of SHARD=framework_tests, SUBSHARD=misc. }); } catch (error, stackTrace) {