Unverified Commit 3519eabe authored by Chris Bracken's avatar Chris Bracken Committed by GitHub

Do not pass --preview-dart-2 to Dart VM (#21455)

--preview-dart-2 is no longer necessary as it is now the default for the
standalone Dart VM.
parent cc1766d4
...@@ -46,7 +46,7 @@ Future<Null> main(List<String> args) async { ...@@ -46,7 +46,7 @@ Future<Null> main(List<String> args) async {
// Analyze all the sample code in the repo // Analyze all the sample code in the repo
await runCommand(dart, await runCommand(dart,
<String>['--preview-dart-2', path.join(flutterRoot, 'dev', 'bots', 'analyze-sample-code.dart')], <String>[path.join(flutterRoot, 'dev', 'bots', 'analyze-sample-code.dart')],
workingDirectory: flutterRoot, workingDirectory: flutterRoot,
); );
...@@ -66,7 +66,6 @@ Future<Null> main(List<String> args) async { ...@@ -66,7 +66,6 @@ Future<Null> main(List<String> args) async {
try { try {
await runCommand(dart, await runCommand(dart,
<String>[ <String>[
'--preview-dart-2',
path.join(flutterRoot, 'dev', 'tools', 'mega_gallery.dart'), path.join(flutterRoot, 'dev', 'tools', 'mega_gallery.dart'),
'--out', '--out',
outDir.path, outDir.path,
...@@ -89,7 +88,6 @@ Future<Null> _verifyInternationalizations() async { ...@@ -89,7 +88,6 @@ Future<Null> _verifyInternationalizations() async {
final EvalResult genResult = await _evalCommand( final EvalResult genResult = await _evalCommand(
dart, dart,
<String>[ <String>[
'--preview-dart-2',
path.join('dev', 'tools', 'gen_localizations.dart'), path.join('dev', 'tools', 'gen_localizations.dart'),
], ],
workingDirectory: flutterRoot, workingDirectory: flutterRoot,
......
...@@ -282,14 +282,15 @@ Future<Null> _runTests(List<String> testArgs, String observatoryUri) async { ...@@ -282,14 +282,15 @@ Future<Null> _runTests(List<String> testArgs, String observatoryUri) async {
printTrace('Running driver tests.'); printTrace('Running driver tests.');
PackageMap.globalPackagesPath = fs.path.normalize(fs.path.absolute(PackageMap.globalPackagesPath)); PackageMap.globalPackagesPath = fs.path.normalize(fs.path.absolute(PackageMap.globalPackagesPath));
final List<String> args = testArgs.toList()
..add('--packages=${PackageMap.globalPackagesPath}')
..add('-rexpanded')
..add('--preview-dart-2');
final String dartVmPath = fs.path.join(dartSdkPath, 'bin', 'dart'); final String dartVmPath = fs.path.join(dartSdkPath, 'bin', 'dart');
final int result = await runCommandAndStreamOutput( final int result = await runCommandAndStreamOutput(
<String>[dartVmPath]..addAll(dartVmFlags)..addAll(args), <String>[dartVmPath]
..addAll(dartVmFlags)
..addAll(testArgs)
..addAll(<String>[
'--packages=${PackageMap.globalPackagesPath}',
'-rexpanded',
]),
environment: <String, String>{ 'VM_SERVICE_URL': observatoryUri } environment: <String, String>{ 'VM_SERVICE_URL': observatoryUri }
); );
if (result != 0) if (result != 0)
......
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