Unverified Commit 61b5caff authored by Zachary Anderson's avatar Zachary Anderson Committed by GitHub

[fuchsia_tester] Plumb through the location of icudtl (#30218)

parent 97622353
...@@ -99,8 +99,7 @@ Future<void> run(List<String> args) async { ...@@ -99,8 +99,7 @@ Future<void> run(List<String> args) async {
fs.link(artifacts.getArtifactPath(Artifact.flutterTester)); fs.link(artifacts.getArtifactPath(Artifact.flutterTester));
testerDestLink.parent.createSync(recursive: true); testerDestLink.parent.createSync(recursive: true);
testerDestLink.createSync(fs.path.absolute(shellPath)); testerDestLink.createSync(fs.path.absolute(shellPath));
final Link icudtlLink = testerDestLink.parent.childLink('icudtl.dat');
icudtlLink.createSync(fs.path.absolute(argResults[_kOptionIcudtl]));
final Directory sdkRootDest = final Directory sdkRootDest =
fs.directory(artifacts.getArtifactPath(Artifact.flutterPatchedSdkPath)); fs.directory(artifacts.getArtifactPath(Artifact.flutterPatchedSdkPath));
sdkRootDest.createSync(recursive: true); sdkRootDest.createSync(recursive: true);
...@@ -141,6 +140,7 @@ Future<void> run(List<String> args) async { ...@@ -141,6 +140,7 @@ Future<void> run(List<String> args) async {
enableObservatory: collector != null, enableObservatory: collector != null,
precompiledDillFiles: tests, precompiledDillFiles: tests,
concurrency: math.max(1, platform.numberOfProcessors - 2), concurrency: math.max(1, platform.numberOfProcessors - 2),
icudtlPath: fs.path.absolute(argResults[_kOptionIcudtl]),
); );
if (collector != null) { if (collector != null) {
......
...@@ -92,6 +92,7 @@ void installHook({ ...@@ -92,6 +92,7 @@ void installHook({
InternetAddressType serverType = InternetAddressType.IPv4, InternetAddressType serverType = InternetAddressType.IPv4,
Uri projectRootDirectory, Uri projectRootDirectory,
FlutterProject flutterProject, FlutterProject flutterProject,
String icudtlPath,
}) { }) {
assert(enableObservatory || (!startPaused && observatoryPort == null)); assert(enableObservatory || (!startPaused && observatoryPort == null));
hack.registerPlatformPlugin( hack.registerPlatformPlugin(
...@@ -111,6 +112,7 @@ void installHook({ ...@@ -111,6 +112,7 @@ void installHook({
updateGoldens: updateGoldens, updateGoldens: updateGoldens,
projectRootDirectory: projectRootDirectory, projectRootDirectory: projectRootDirectory,
flutterProject: flutterProject, flutterProject: flutterProject,
icudtlPath: icudtlPath,
), ),
); );
} }
...@@ -390,6 +392,7 @@ class _FlutterPlatform extends PlatformPlugin { ...@@ -390,6 +392,7 @@ class _FlutterPlatform extends PlatformPlugin {
this.updateGoldens, this.updateGoldens,
this.projectRootDirectory, this.projectRootDirectory,
this.flutterProject, this.flutterProject,
this.icudtlPath,
}) : assert(shellPath != null); }) : assert(shellPath != null);
final String shellPath; final String shellPath;
...@@ -406,6 +409,7 @@ class _FlutterPlatform extends PlatformPlugin { ...@@ -406,6 +409,7 @@ class _FlutterPlatform extends PlatformPlugin {
final bool updateGoldens; final bool updateGoldens;
final Uri projectRootDirectory; final Uri projectRootDirectory;
final FlutterProject flutterProject; final FlutterProject flutterProject;
final String icudtlPath;
Directory fontsDirectory; Directory fontsDirectory;
_Compiler compiler; _Compiler compiler;
...@@ -952,6 +956,10 @@ class _FlutterPlatform extends PlatformPlugin { ...@@ -952,6 +956,10 @@ class _FlutterPlatform extends PlatformPlugin {
command.add('--ipv6'); command.add('--ipv6');
} }
if (icudtlPath != null) {
command.add('--icu-data-file-path=$icudtlPath');
}
command.addAll(<String>[ command.addAll(<String>[
'--enable-checked-mode', '--enable-checked-mode',
'--verify-entry-points', '--verify-entry-points',
......
...@@ -36,6 +36,7 @@ Future<int> runTests( ...@@ -36,6 +36,7 @@ Future<int> runTests(
TestWatcher watcher, TestWatcher watcher,
@required int concurrency, @required int concurrency,
FlutterProject flutterProject, FlutterProject flutterProject,
String icudtlPath,
}) async { }) async {
// Compute the command-line arguments for package:test. // Compute the command-line arguments for package:test.
final List<String> testArgs = <String>[]; final List<String> testArgs = <String>[];
...@@ -83,6 +84,7 @@ Future<int> runTests( ...@@ -83,6 +84,7 @@ Future<int> runTests(
updateGoldens: updateGoldens, updateGoldens: updateGoldens,
projectRootDirectory: fs.currentDirectory.uri, projectRootDirectory: fs.currentDirectory.uri,
flutterProject: flutterProject, flutterProject: flutterProject,
icudtlPath: icudtlPath,
); );
// Make the global packages path absolute. // Make the global packages path absolute.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment