Revert "Reland "Merge more Kernel infrastructure from kernel_sdk SDK fork.""

tools/testing/dart/test_runner.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Classes and methods for executing tests.
  *
  * This module includes:
  * - Managing parallel execution of tests, including timeout checks.
  * - Evaluating the output of each test as pass/fail/crash/timeout.
@@ skipping 203 matching lines @@
     builder.addJson(_bootstrapDependencies);
   }
 
   bool _equal(CompilationCommand other) =>
       super._equal(other) &&
       _outputFile == other._outputFile &&
       _neverSkipCompilation == other._neverSkipCompilation &&
       deepJsonCompare(_bootstrapDependencies, other._bootstrapDependencies);
 }
 
-class KernelCompilationCommand extends CompilationCommand {
-  KernelCompilationCommand._(
-      String displayName,
-      String outputFile,
-      bool neverSkipCompilation,
-      List<Uri> bootstrapDependencies,
-      String executable,
-      List<String> arguments,
-      Map<String, String> environmentOverrides)
-      : super._(displayName, outputFile, neverSkipCompilation,
-                bootstrapDependencies, executable, arguments,
-                environmentOverrides);
-}
-
 /// This is just a Pair(String, Map) class with hashCode and operator ==
 class AddFlagsKey {
   final String flags;
   final Map env;
   AddFlagsKey(this.flags, this.env);
   // Just use object identity for environment map
   bool operator ==(other) =>
       other is AddFlagsKey && flags == other.flags && env == other.env;
   int get hashCode => flags.hashCode ^ env.hashCode;
 }
@@ skipping 409 matching lines @@
         displayName,
         outputFile,
         neverSkipCompilation,
         bootstrapDependencies,
         executable,
         arguments,
         environment);
     return _getUniqueCommand(command);
   }
 
-  CompilationCommand getKernelCompilationCommand(
-      String displayName,
-      outputFile,
-      neverSkipCompilation,
-      List<Uri> bootstrapDependencies,
-      String executable,
-      List<String> arguments,
-      Map<String, String> environment) {
-    var command = new KernelCompilationCommand._(
-        displayName,
-        outputFile,
-        neverSkipCompilation,
-        bootstrapDependencies,
-        executable,
-        arguments,
-        environment);
-    return _getUniqueCommand(command);
-  }
-
   AnalysisCommand getAnalysisCommand(
       String displayName, executable, arguments, environmentOverrides,
       {String flavor: 'dart2analyzer'}) {
     var command = new AnalysisCommand._(
         flavor, displayName, executable, arguments, environmentOverrides);
     return _getUniqueCommand(command);
   }
 
   VmCommand getVmCommand(String executable, List<String> arguments,
       Map<String, String> environmentOverrides) {
@@ skipping 939 matching lines @@
       assert(exitCode != 0);
       return Expectation.COMPILETIME_ERROR;
     }
 
     Expectation outcome =
         exitCode == 0 ? Expectation.PASS : Expectation.COMPILETIME_ERROR;
     return _negateOutcomeIfNegativeTest(outcome, testCase.isNegative);
   }
 }
 
-class KernelCompilationCommandOutputImpl extends CompilationCommandOutputImpl {
-  KernelCompilationCommandOutputImpl(
-      Command command, int exitCode, bool timedOut,
-      List<int> stdout, List<int> stderr,
-      Duration time, bool compilationSkipped)
-      : super(command, exitCode, timedOut, stdout, stderr, time,
-              compilationSkipped);
-
-  bool get canRunDependendCommands {
-    // See [BatchRunnerProcess]: 0 means success, 1 means compile-time error.
-    // TODO(asgerf): When the frontend supports it, continue running even if
-    //   there were compile-time errors. See kernel_sdk issue #18.
-    return !hasCrashed && !timedOut && exitCode == 0;
-  }
-
-  // If the compiler was able to produce a Kernel IR file we want to run the
-  // result on the Dart VM.  We therefore mark the [KernelCompilationCommand] as
-  // successful.
-  // => This ensures we test that the DartVM produces correct CompileTime errors
-  //    as it is supposed to for our test suites.
-  bool get successful => canRunDependendCommands;
-}
-
 class JsCommandlineOutputImpl extends CommandOutputImpl
     with UnittestSuiteMessagesMixin {
   JsCommandlineOutputImpl(Command command, int exitCode, bool timedOut,
       List<int> stdout, List<int> stderr, Duration time)
       : super(command, exitCode, timedOut, stdout, stderr, time, false, 0);
 
   Expectation result(TestCase testCase) {
     // Handle crashes and timeouts first
     if (hasCrashed) return Expectation.CRASH;
     if (hasTimedOut) return Expectation.TIMEOUT;
@@ skipping 54 matching lines @@
         command, exitCode, timedOut, stdout, stderr, time, compilationSkipped);
   } else if (command is BrowserTestCommand) {
     return new HTMLBrowserCommandOutputImpl(
         command, exitCode, timedOut, stdout, stderr, time, compilationSkipped);
   } else if (command is AnalysisCommand) {
     return new AnalysisCommandOutputImpl(
         command, exitCode, timedOut, stdout, stderr, time, compilationSkipped);
   } else if (command is VmCommand) {
     return new VmCommandOutputImpl(
         command, exitCode, timedOut, stdout, stderr, time, pid);
-  } else if (command is KernelCompilationCommand) {
-    return new KernelCompilationCommandOutputImpl(
-        command, exitCode, timedOut, stdout, stderr, time, compilationSkipped);
   } else if (command is AdbPrecompilationCommand) {
     return new VmCommandOutputImpl(
         command, exitCode, timedOut, stdout, stderr, time, pid);
   } else if (command is CompilationCommand) {
     if (command.displayName == 'precompiler' ||
         command.displayName == 'dart2snapshot') {
       return new VmCommandOutputImpl(
           command, exitCode, timedOut, stdout, stderr, time, pid);
     }
     return new CompilationCommandOutputImpl(
@@ skipping 846 matching lines @@
     }
     return runCommand(command.maxNumRetries);
   }
 
   Future<CommandOutput> _runCommand(Command command, int timeout) {
     var batchMode = !globalConfiguration['noBatch'];
     var dart2jsBatchMode = globalConfiguration['dart2js_batch'];
 
     if (command is BrowserTestCommand) {
       return _startBrowserControllerTest(command, timeout);
-    } else if (command is KernelCompilationCommand) {
-      // For now, we always run dartk in batch mode.
-      var name = command.displayName;
-      assert(name == 'dartk');
-      return _getBatchRunner(name)
-          .runCommand(name, command, timeout, command.arguments);
     } else if (command is CompilationCommand && dart2jsBatchMode) {
       return _getBatchRunner("dart2js")
           .runCommand("dart2js", command, timeout, command.arguments);
     } else if (command is AnalysisCommand && batchMode) {
       return _getBatchRunner(command.flavor)
           .runCommand(command.flavor, command, timeout, command.arguments);
     } else if (command is ScriptCommand) {
       return command.run();
     } else if (command is AdbPrecompilationCommand) {
       assert(adbDevicePool != null);
@@ skipping 512 matching lines @@
     }
   }
 
   void eventAllTestsDone() {
     for (var listener in _eventListener) {
       listener.allDone();
     }
     _allDone();
   }
 }