Skip to content

Commit

Permalink
Update to 3.21-candidate.10
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaowei-guan committed Mar 20, 2024
1 parent 1df4f7f commit b40c616
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bin/internal/flutter.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ba393198430278b6595976de84fe170f553cc728
03b5ea519aa42172bb2789898ed01bdc169ec481
2 changes: 0 additions & 2 deletions lib/build_targets/application.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import 'package:flutter_tools/src/build_system/targets/android.dart';
import 'package:flutter_tools/src/build_system/targets/assets.dart';
import 'package:flutter_tools/src/build_system/targets/common.dart';
import 'package:flutter_tools/src/build_system/targets/icon_tree_shaker.dart';
import 'package:flutter_tools/src/build_system/targets/shader_compiler.dart';
import 'package:flutter_tools/src/compile.dart';
import 'package:flutter_tools/src/dart/package_map.dart';
import 'package:package_config/src/package_config.dart';
Expand Down Expand Up @@ -157,7 +156,6 @@ abstract class TizenAssetBundle extends Target {
environment,
outputDirectory,
targetPlatform: TargetPlatform.android,
shaderTarget: ShaderTarget.sksl,
);
final DepfileService depfileService = DepfileService(
fileSystem: environment.fileSystem,
Expand Down
53 changes: 53 additions & 0 deletions lib/commands/test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import 'package:flutter_tools/src/dart/language_version.dart';
import 'package:flutter_tools/src/dart/package_map.dart';
import 'package:flutter_tools/src/device.dart';
import 'package:flutter_tools/src/globals.dart' as globals;
import 'package:flutter_tools/src/native_assets.dart';
import 'package:flutter_tools/src/project.dart';
import 'package:flutter_tools/src/runner/flutter_command.dart';
import 'package:flutter_tools/src/test/runner.dart';
Expand Down Expand Up @@ -132,6 +133,7 @@ void main() {
Device? integrationTestDevice,
String? integrationTestUserIdentifier,
TestTimeRecorder? testTimeRecorder,
TestCompilerNativeAssetsBuilder? nativeAssetsBuilder,
}) async {
if (isIntegrationTest) {
testFiles = await _generateEntrypointWrappers(testFiles);
Expand Down Expand Up @@ -167,6 +169,57 @@ void main() {
integrationTestDevice: integrationTestDevice,
integrationTestUserIdentifier: integrationTestUserIdentifier,
testTimeRecorder: testTimeRecorder,
nativeAssetsBuilder: nativeAssetsBuilder,
);
}

@override
Future<int> runTestsBySpawningLightweightEngines(List<Uri> testFiles,
{required DebuggingOptions debuggingOptions,
List<String> names = const <String>[],
List<String> plainNames = const <String>[],
String? tags,
String? excludeTags,
bool machine = false,
bool updateGoldens = false,
required int? concurrency,
String? testAssetDirectory,
FlutterProject? flutterProject,
String? icudtlPath,
String? randomSeed,
String? reporter,
String? fileReporter,
String? timeout,
bool runSkipped = false,
int? shardIndex,
int? totalShards,
TestTimeRecorder? testTimeRecorder,
TestCompilerNativeAssetsBuilder? nativeAssetsBuilder}) async {
if (isIntegrationTest) {
testFiles = await _generateEntrypointWrappers(testFiles);
}
return testRunner.runTestsBySpawningLightweightEngines(
testFiles,
debuggingOptions: debuggingOptions,
names: names,
plainNames: plainNames,
tags: tags,
excludeTags: excludeTags,
machine: machine,
updateGoldens: updateGoldens,
concurrency: concurrency,
testAssetDirectory: testAssetDirectory,
flutterProject: flutterProject,
icudtlPath: icudtlPath,
randomSeed: randomSeed,
reporter: reporter,
fileReporter: fileReporter,
timeout: timeout,
runSkipped: runSkipped,
shardIndex: shardIndex,
totalShards: totalShards,
testTimeRecorder: testTimeRecorder,
nativeAssetsBuilder: nativeAssetsBuilder,
);
}
}

0 comments on commit b40c616

Please sign in to comment.