firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "re-enable dart2js test (#29010)" (#29030)

Browse Source 
This reverts commit 6a7f231d89156272a5317141f1cde64fae93c9b4.
This commit is contained in:
Jonah Williams 2019-03-07 22:18:15 -08:00 committed by GitHub
parent 6a7f231d89
commit 77142b8257
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dev/bots/test.dart
View File

@ -191,21 +191,22 @@ Future<void> _runBuildTests() async {
await _flutterBuildApk(path);
await _flutterBuildIpa(path);
}
await _flutterBuildDart2js(path.join('dev', 'integration_tests', 'web'));
// TODO(jonahwilliams): re-enable when engine rolls.
//await _flutterBuildDart2js(path.join('dev', 'integration_tests', 'web'));
print('${bold}DONE: All build tests successful.$reset');
}
Future<void> _flutterBuildDart2js(String relativePathToApplication) async {
print('Running Dart2JS build tests...');
await runCommand(flutter,
<String>['build', 'web', '-v'],
workingDirectory: path.join(flutterRoot, relativePathToApplication),
expectNonZeroExit: false,
timeout: _kShortTimeout,
);
print('Done.');
}
// Future<void> _flutterBuildDart2js(String relativePathToApplication) async {
// print('Running Dart2JS build tests...');
// await runCommand(flutter,
// <String>['build', 'web', '-v'],
// workingDirectory: path.join(flutterRoot, relativePathToApplication),
// expectNonZeroExit: false,
// timeout: _kShortTimeout,
// );
// print('Done.');
// }
Future<void> _flutterBuildAot(String relativePathToApplication) async {
print('Running AOT build tests...');

4
packages/flutter_tools/lib/src/artifacts.dart
View File

@ -73,9 +73,9 @@ String _artifactToFileName(Artifact artifact, [ TargetPlatform platform, BuildMo
case Artifact.engineDartBinary:
return 'dart';
case Artifact.dart2jsSnapshot:
return 'dart2js.dart.snapshot';
return 'flutter_dart2js.dart.snapshot';
case Artifact.kernelWorkerSnapshot:
return 'kernel_worker.dart.snapshot';
return 'flutter_kernel_worker.dart.snapshot';
}
assert(false, 'Invalid artifact $artifact.');
return null;

8
packages/flutter_tools/lib/src/commands/build_web.dart
View File

@ -4,11 +4,10 @@
import 'dart:async';
import '../base/common.dart';
import '../base/logger.dart';
import '../build_info.dart';
import '../globals.dart';
import '../runner/flutter_command.dart' show FlutterCommandResult;
import '../runner/flutter_command.dart' show ExitStatus, FlutterCommandResult;
import '../web/compile.dart';
import 'build.dart';
@ -34,9 +33,6 @@ class BuildWebCommand extends BuildSubCommand {
final Status status = logger.startProgress('Compiling $target to JavaScript...', timeout: null);
final int result = await webCompiler.compile(target: target);
status.stop();
if (result != 0) {
throwToolExit('JavaScript compilation failed.');
}
return null;
return FlutterCommandResult(result == 0 ? ExitStatus.success : ExitStatus.fail);
}
}