Skip to content

Commit ece6ac2

Browse files
authored
Clean up flutterRoot (#147010)
The flutterroot param is accessible from the util function after the recent refactor of utils flutter/flutter#146592 so this change cleans up the references to the suite runners to make them simpler. Part of flutter/flutter#145482
1 parent 7433225 commit ece6ac2

10 files changed

+18
-19
lines changed

dev/bots/suite_runners/run_add_to_app_life_cycle_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:path/path.dart' as path;
99
import '../run_command.dart';
1010
import '../utils.dart';
1111

12-
Future<void> addToAppLifeCycleRunner(String flutterRoot) async {
12+
Future<void> addToAppLifeCycleRunner() async {
1313
if (Platform.isMacOS) {
1414
printProgress('${green}Running add-to-app life cycle iOS integration tests$reset...');
1515
final String addToAppDir = path.join(flutterRoot, 'dev', 'integration_tests', 'ios_add2app_life_cycle');

dev/bots/suite_runners/run_analyze_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:path/path.dart' as path;
77
import '../run_command.dart';
88
import '../utils.dart';
99

10-
Future<void> analyzeRunner(String flutterRoot) async {
10+
Future<void> analyzeRunner() async {
1111
printProgress('${green}Running analysis testing$reset');
1212
await runCommand(
1313
'dart',

dev/bots/suite_runners/run_customer_testing_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:path/path.dart' as path;
99
import '../run_command.dart';
1010
import '../utils.dart';
1111

12-
Future<void> customerTestingRunner(String flutterRoot) async {
12+
Future<void> customerTestingRunner() async {
1313
printProgress('${green}Running customer testing$reset');
1414
await runCommand(
1515
'git',

dev/bots/suite_runners/run_docs_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import '../run_command.dart';
66
import '../utils.dart';
77

8-
Future<void> docsRunner(String flutterRoot) async {
8+
Future<void> docsRunner() async {
99
printProgress('${green}Running flutter doc tests$reset');
1010
await runCommand(
1111
'./dev/bots/docs.sh',

dev/bots/suite_runners/run_flutter_packages_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import '../run_command.dart';
1212
import '../utils.dart';
1313

1414
/// Executes the test suite for the flutter/packages repo.
15-
Future<void> flutterPackagesRunner(String flutterRoot) async {
15+
Future<void> flutterPackagesRunner() async {
1616

1717
Future<void> runAnalyze() async {
1818
printProgress('${green}Running analysis for flutter/packages$reset');

dev/bots/suite_runners/run_fuchsia_precache.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import '../run_command.dart';
66
import '../utils.dart';
77

88
// Runs flutter_precache.
9-
Future<void> fuchsiaPrecacheRunner(String flutterRoot) async {
9+
Future<void> fuchsiaPrecacheRunner() async {
1010
printProgress('${green}Running flutter precache tests$reset');
1111
await runCommand(
1212
'flutter',

dev/bots/suite_runners/run_realm_checker_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:path/path.dart' as path;
88

99
import '../utils.dart';
1010

11-
Future<void> realmCheckerTestRunner(String flutterRoot) async {
11+
Future<void> realmCheckerTestRunner() async {
1212
final String engineRealmFile = path.join(flutterRoot, 'bin', 'internal', 'engine.realm');
1313

1414
final String engineRealm = File(engineRealmFile).readAsStringSync().trim();

dev/bots/suite_runners/run_verify_binaries_codesigned_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import 'package:process/process.dart';
1212
import '../run_command.dart';
1313
import '../utils.dart';
1414

15-
Future<void> verifyCodesignedTestRunner(String flutterRoot) async {
15+
Future<void> verifyCodesignedTestRunner() async {
1616
printProgress('${green}Running binaries codesign verification$reset');
1717
await runCommand(
1818
'flutter',

dev/bots/suite_runners/run_web_tests.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ typedef ShardRunner = Future<void> Function();
1717

1818
class WebTestsSuite {
1919

20-
WebTestsSuite(this.flutterRoot, this.flutterTestArgs);
20+
WebTestsSuite(this.flutterTestArgs);
2121

2222
/// Tests that we don't run on Web.
2323
///
@@ -87,7 +87,6 @@ class WebTestsSuite {
8787

8888
static const List<String> _kAllBuildModes = <String>['debug', 'profile', 'release'];
8989

90-
final String flutterRoot;
9190
final List<String> flutterTestArgs;
9291

9392
/// Coarse-grained integration tests running on the Web.

dev/bots/test.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ Future<void> main(List<String> args) async {
136136
if (Platform.environment.containsKey(CIRRUS_TASK_NAME)) {
137137
printProgress('Running task: ${Platform.environment[CIRRUS_TASK_NAME]}');
138138
}
139-
final WebTestsSuite webTestsSuite = WebTestsSuite(flutterRoot, flutterTestArgs);
139+
final WebTestsSuite webTestsSuite = WebTestsSuite(flutterTestArgs);
140140
await selectShard(<String, ShardRunner>{
141-
'add_to_app_life_cycle_tests': () => addToAppLifeCycleRunner(flutterRoot),
141+
'add_to_app_life_cycle_tests': addToAppLifeCycleRunner,
142142
'build_tests': _runBuildTests,
143143
'framework_coverage': frameworkCoverageRunner,
144144
'framework_tests': _runFrameworkTests,
@@ -156,14 +156,14 @@ Future<void> main(List<String> args) async {
156156
'web_skwasm_tests': webTestsSuite.runWebSkwasmUnitTests,
157157
// All web integration tests
158158
'web_long_running_tests': webTestsSuite.webLongRunningTestsRunner,
159-
'flutter_plugins': () => flutterPackagesRunner(flutterRoot),
159+
'flutter_plugins': flutterPackagesRunner,
160160
'skp_generator': skpGeneratorTestsRunner,
161-
'realm_checker': () => realmCheckerTestRunner(flutterRoot),
162-
'customer_testing': () => customerTestingRunner(flutterRoot),
163-
'analyze': () => analyzeRunner(flutterRoot),
164-
'fuchsia_precache': () => fuchsiaPrecacheRunner(flutterRoot),
165-
'docs': () => docsRunner(flutterRoot),
166-
'verify_binaries_codesigned': () => verifyCodesignedTestRunner(flutterRoot),
161+
'realm_checker': realmCheckerTestRunner,
162+
'customer_testing': customerTestingRunner,
163+
'analyze': analyzeRunner,
164+
'fuchsia_precache': fuchsiaPrecacheRunner,
165+
'docs': docsRunner,
166+
'verify_binaries_codesigned': verifyCodesignedTestRunner,
167167
kTestHarnessShardName: _runTestHarnessTests, // Used for testing this script; also run as part of SHARD=framework_tests, SUBSHARD=misc.
168168
});
169169
} catch (error, stackTrace) {

0 commit comments

Comments
 (0)