diff --git a/dev/bots/test.dart b/dev/bots/test.dart index fc659ea1806..7073a9f3b03 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -236,8 +236,7 @@ Future _runIntegrationToolTests() async { } Future _runFlutterBuildApkHealthTests() async { - // Try "priming" the test environment by running historically problematic tests first. - final List toolIntegrationTests = Directory(path.join(_toolsPath, 'test', 'integration.shard')) + final List allTests = Directory(path.join(_toolsPath, 'test', 'flutter_build_apk.shard')) .listSync(recursive: true).whereType() .map((FileSystemEntity entry) => path.relative(entry.path, from: _toolsPath)) .where((String testPath) => path.basename(testPath).endsWith('_test.dart')).toList(); @@ -245,21 +244,7 @@ Future _runFlutterBuildApkHealthTests() async { await runDartTest( _toolsPath, forceSingleCore: true, - testPaths: selectIndexOfTotalSubshard(toolIntegrationTests, subshardKey: '6_6'), - collectMetrics: true, - runSkipped: true, - ); - - // Then run the health tests after. - final List flutterBuildApkTests = Directory(path.join(_toolsPath, 'test', 'flutter_build_apk.shard')) - .listSync(recursive: true).whereType() - .map((FileSystemEntity entry) => path.relative(entry.path, from: _toolsPath)) - .where((String testPath) => path.basename(testPath).endsWith('_test.dart')).toList(); - - await runDartTest( - _toolsPath, - forceSingleCore: true, - testPaths: selectIndexOfTotalSubshard(flutterBuildApkTests), + testPaths: selectIndexOfTotalSubshard(allTests), collectMetrics: true, ); } diff --git a/dev/bots/utils.dart b/dev/bots/utils.dart index 76832ba17a6..be8ab9b028d 100644 --- a/dev/bots/utils.dart +++ b/dev/bots/utils.dart @@ -342,7 +342,6 @@ Future runDartTest(String workingDirectory, { bool ensurePrecompiledTool = true, bool shuffleTests = true, bool collectMetrics = false, - bool runSkipped = false, }) async { int? cpus; final String? cpuVariable = Platform.environment['CPU']; // CPU is set in cirrus.yml @@ -380,8 +379,6 @@ Future runDartTest(String workingDirectory, { '--coverage=$coverage', if (perTestTimeout != null) '--timeout=${perTestTimeout.inMilliseconds}ms', - if (runSkipped) - '--run-skipped', if (testPaths != null) for (final String testPath in testPaths) testPath,