Unverified Commit 16f7d401 authored by Mehmet Fidanboylu's avatar Mehmet Fidanboylu Committed by GitHub

Remove unneeded flutter-assets-dir flag for the tester (#23125)

parent 9dff83f4
...@@ -480,7 +480,6 @@ class _FlutterPlatform extends PlatformPlugin { ...@@ -480,7 +480,6 @@ class _FlutterPlatform extends PlatformPlugin {
packages: PackageMap.globalPackagesPath, packages: PackageMap.globalPackagesPath,
enableObservatory: enableObservatory, enableObservatory: enableObservatory,
startPaused: startPaused, startPaused: startPaused,
bundlePath: _getBundlePath(finalizers, ourTestCount),
observatoryPort: explicitObservatoryPort, observatoryPort: explicitObservatoryPort,
serverPort: server.port, serverPort: server.port,
); );
...@@ -712,37 +711,6 @@ class _FlutterPlatform extends PlatformPlugin { ...@@ -712,37 +711,6 @@ class _FlutterPlatform extends PlatformPlugin {
return listenerFile.path; return listenerFile.path;
} }
String _getBundlePath(List<_Finalizer> finalizers, int ourTestCount) {
if (precompiledDillPath != null) {
return artifacts.getArtifactPath(Artifact.flutterPatchedSdkPath);
}
// bundlePath needs to point to a folder with `platform.dill` file.
final Directory tempBundleDirectory = fs.systemTempDirectory
.createTempSync('flutter_test_bundle.');
finalizers.add(() async {
printTrace(
'test $ourTestCount: deleting temporary bundle directory');
tempBundleDirectory.deleteSync(recursive: true);
});
// copy 'vm_platform_strong.dill' into 'platform_strong.dill'
final File vmPlatformStrongDill = fs.file(
artifacts.getArtifactPath(Artifact.platformKernelDill),
);
printTrace('Copying platform_strong.dill file from ${vmPlatformStrongDill.path}');
final File platformDill = vmPlatformStrongDill.copySync(
tempBundleDirectory
.childFile('platform_strong.dill')
.path,
);
if (!platformDill.existsSync()) {
printError('unexpected error copying platform kernel file');
}
return tempBundleDirectory.path;
}
String _generateTestMain({ String _generateTestMain({
Uri testUrl, Uri testUrl,
}) { }) {
...@@ -813,7 +781,6 @@ class _FlutterPlatform extends PlatformPlugin { ...@@ -813,7 +781,6 @@ class _FlutterPlatform extends PlatformPlugin {
String executable, String executable,
String testPath, { String testPath, {
String packages, String packages,
String bundlePath,
bool enableObservatory = false, bool enableObservatory = false,
bool startPaused = false, bool startPaused = false,
int observatoryPort, int observatoryPort,
...@@ -841,9 +808,7 @@ class _FlutterPlatform extends PlatformPlugin { ...@@ -841,9 +808,7 @@ class _FlutterPlatform extends PlatformPlugin {
} }
if (host.type == InternetAddressType.IPv6) if (host.type == InternetAddressType.IPv6)
command.add('--ipv6'); command.add('--ipv6');
if (bundlePath != null) {
command.add('--flutter-assets-dir=$bundlePath');
}
command.add('--enable-checked-mode'); command.add('--enable-checked-mode');
command.addAll(<String>[ command.addAll(<String>[
'--enable-software-rendering', '--enable-software-rendering',
......
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