Use platform.dill for more fasta tests, skip shaker test

Issue #32530
Issue #32531

Change-Id: Ie31a9e4d82fb942e48aa9a9c89c45eefb132702f
Reviewed-on: https://dart-review.googlesource.com/46520
Reviewed-by: Peter von der Ahé <[email protected]>

Author: mkustermann

pkg/front_end/lib/src/fasta/kernel/verifier.dart

@@ -37,8 +37,10 @@ import '../type_inference/type_schema.dart' show TypeSchemaVisitor, UnknownType;
 import 'redirecting_factory_body.dart'
     show RedirectingFactoryBody, getRedirectingFactoryBody;
 
-List<LocatedMessage> verifyProgram(Program program, {bool isOutline: false}) {
-  FastaVerifyingVisitor verifier = new FastaVerifyingVisitor(isOutline);
+List<LocatedMessage> verifyProgram(Program program,
+    {bool isOutline: false, bool skipPlatform: false}) {
+  FastaVerifyingVisitor verifier =
+      new FastaVerifyingVisitor(isOutline, skipPlatform);
   program.accept(verifier);
   return verifier.errors;
 }
@@ -48,8 +50,9 @@ class FastaVerifyingVisitor extends VerifyingVisitor
   final List<LocatedMessage> errors = <LocatedMessage>[];
 
   Uri fileUri;
+  final bool skipPlatform;
 
-  FastaVerifyingVisitor(bool isOutline) {
+  FastaVerifyingVisitor(bool isOutline, this.skipPlatform) {
     this.isOutline = isOutline;
   }
 
@@ -129,6 +132,10 @@ class FastaVerifyingVisitor extends VerifyingVisitor
 
   @override
   visitLibrary(Library node) {
+    // Issue(http://dartbug.com/32530)
+    if (skipPlatform && node.importUri.scheme == 'dart') {
+      return;
+    }
     fileUri = checkLocation(node, node.name, node.fileUri);
     super.visitLibrary(node);
   }

pkg/front_end/lib/src/fasta/testing/kernel_chain.dart

@@ -73,7 +73,8 @@ class Verify extends Step<Program, Program, ChainContext> {
   Future<Result<Program>> run(Program program, ChainContext context) async {
     var options = new ProcessedOptions(new CompilerOptions());
     return await CompilerContext.runWithOptions(options, (_) async {
-      var errors = verifyProgram(program, isOutline: !fullCompile);
+      var errors =
+          verifyProgram(program, isOutline: !fullCompile, skipPlatform: true);
       if (errors.isEmpty) {
         return pass(program);
       } else {

pkg/front_end/test/fasta/testing/suite.dart

@@ -111,8 +111,7 @@ class FastaContext extends ChainContext {
   final Map<Program, KernelTarget> programToTarget = <Program, KernelTarget>{};
   final Uri platformBinaries;
   Uri platformUri;
-  Uri outlineUri;
-  Program outline;
+  Program platform;
 
   final ExpectationSet expectationSet =
       new ExpectationSet.fromJsonList(JSON.decode(EXPECTATIONS));
@@ -158,19 +157,18 @@ class FastaContext extends ChainContext {
 
   Future ensurePlatformUris() async {
     if (platformUri == null) {
-      platformUri = platformBinaries.resolve("vm_platform.dill");
-      outlineUri = platformBinaries
-          .resolve(strongMode ? "vm_outline_strong.dill" : "vm_outline.dill");
+      platformUri = platformBinaries
+          .resolve(strongMode ? "vm_platform_strong.dill" : "vm_platform.dill");
     }
   }
 
-  Future<Program> loadPlatformOutline() async {
-    if (outline == null) {
+  Future<Program> loadPlatform() async {
+    if (platform == null) {
       await ensurePlatformUris();
-      outline =
-          loadProgramFromBytes(new File.fromUri(outlineUri).readAsBytesSync());
+      platform =
+          loadProgramFromBytes(new File.fromUri(platformUri).readAsBytesSync());
     }
-    return outline;
+    return platform;
   }
 
   @override
@@ -281,11 +279,11 @@ class Outline extends Step<TestDescription, Program, FastaContext> {
       // Disable colors to ensure that expectation files are the same across
       // platforms and independent of stdin/stderr.
       CompilerContext.current.disableColors();
-      Program platformOutline = await context.loadPlatformOutline();
+      Program platform = await context.loadPlatform();
       Ticker ticker = new Ticker();
       DillTarget dillTarget = new DillTarget(ticker, context.uriTranslator,
           new TestVmTarget(new TargetFlags(strongMode: strongMode)));
-      dillTarget.loader.appendLibraries(platformOutline);
+      dillTarget.loader.appendLibraries(platform);
       // We create a new URI translator to avoid reading platform libraries from
       // file system.
       UriTranslatorImpl uriTranslator = new UriTranslatorImpl(

pkg/pkg.status

@@ -37,11 +37,12 @@ dev_compiler/test/worker/*: Skip # Skip dev_compiler codegen tests
 front_end/test/fasta/analyze_test: Pass, Slow
 front_end/test/fasta/ast_builder_test: Pass, Slow
 front_end/test/fasta/bootstrap_test: Pass, Slow
-front_end/test/fasta/compile_test: Pass, Slow
+front_end/test/fasta/compile_test: Pass, ExtraSlow
 front_end/test/fasta/outline_test: Pass, Slow
 front_end/test/fasta/rasta/*: SkipByDesign # Anything in rasta is input to fasta unit tests and shouldn't be run as tests.
 front_end/test/fasta/sdk_test: SkipByDesign # sdk_test would take too long to complete, and should be run in a different way.
-front_end/test/fasta/strong_test: Pass, Slow
+front_end/test/fasta/shaker_test: Skip # Issue http://dartbug.com/32531
+front_end/test/fasta/strong_test: Pass, ExtraSlow
 front_end/test/minimal_incremental_kernel_generator_test: Slow, Pass
 front_end/test/whole_program_test: Slow, Pass
 front_end/testcases/*: Skip # These are not tests but input for tests.