Revert "Dart2js testing: Add prefix files when running dart2js output on d8 or jsshell."

tools/testing/dart/compiler_configuration.dart

 // Copyright (c) 2014, 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.
 
 library compiler_configuration;
 
 import 'dart:io' show
     Platform;
 
 import 'runtime_configuration.dart' show
     RuntimeConfiguration;
 
 import 'test_runner.dart' show
     Command,
     CommandBuilder,
     CompilationCommand;
 
 import 'test_suite.dart' show
-    TestInformation,
-    TestUtils;
+    TestInformation;
 
 /// Grouping of a command with its expected result.
 class CommandArtifact {
   final List<Command> commands;
 
   /// Expected result of running [command].
   final String filename;
 
   /// MIME type of [filename].
   final String mimeType;
@@ skipping 87 matching lines @@
       String buildDir,
       String tempDir,
       CommandBuilder commandBuilder,
       List arguments,
       Map<String, String> environmentOverrides) {
     return new CommandArtifact([], null, null);
   }
 
   List<String> computeRuntimeArguments(
       RuntimeConfiguration runtimeConfiguration,
-      String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     return <String>[artifact.filename];
   }
 }
 
 /// The "none" compiler.
 class NoneCompilerConfiguration extends CompilerConfiguration {
   NoneCompilerConfiguration({
       bool isDebug,
       bool isChecked,
       bool isHostChecked,
       bool useSdk})
       : super._subclass(
           isDebug: isDebug, isChecked: isChecked,
           isHostChecked: isHostChecked, useSdk: useSdk);
 
   bool get hasCompiler => false;
 
   List<String> computeRuntimeArguments(
       RuntimeConfiguration runtimeConfiguration,
-      String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     return <String>[]
         ..addAll(vmOptions)
         ..addAll(sharedOptions)
         ..addAll(originalArguments);
   }
 }
 
 /// Common configuration for dart2js-based tools, such as, dart2js and
 /// dart2dart.
 class Dart2xCompilerConfiguration extends CompilerConfiguration {
   final String moniker;
 
   Dart2xCompilerConfiguration(
       this.moniker,
       {bool isDebug,
       bool isChecked,
       bool isHostChecked,
       bool useSdk})
       : super._subclass(
           isDebug: isDebug, isChecked: isChecked,
           isHostChecked: isHostChecked, useSdk: useSdk);
 
   String computeCompilerPath(String buildDir) {
-    var prefix = 'sdk/bin';
+    var prefix = 'sdk/bin/';
     String suffix = executableScriptSuffix;
     if (isHostChecked) {
       // The script dart2js_developer is not included in the
       // shipped SDK, that is the script is not installed in
       // "$buildDir/dart-sdk/bin/"
       return '$prefix/dart2js_developer$suffix';
     } else {
       if (useSdk) {
         prefix = '$buildDir/dart-sdk/bin';
       }
@@ skipping 65 matching lines @@
                 CommandBuilder.instance,
                 arguments,
                 environmentOverrides)],
         // dart2js always produce both out.js and out.precompiled.js. To avoid
         // recompiling the CSP version, we always tell the CompilationCommand
         // to track the timestamp of out.js, but select which one to run based
         // on CSP mode.
         isCsp ? cspOutput : normalOutput,
         'application/javascript');
   }
-
-  List<String> computeRuntimeArguments(
-      RuntimeConfiguration runtimeConfiguration,
-      String buildDir,
-      TestInformation info,
-      List<String> vmOptions,
-      List<String> sharedOptions,
-      List<String> originalArguments,
-      CommandArtifact artifact) {
-    Uri sdk = useSdk ?
-        nativeDirectoryToUri(buildDir).resolve('dart-sdk/') :
-        nativeDirectoryToUri(TestUtils.dartDir().toNativePath())
-                                                .resolve('sdk/');
-    Uri preambleDir = sdk.resolve('lib/_internal/lib/preambles/');
-    return runtimeConfiguration.dart2jsPreambles(preambleDir)
-        ..add(artifact.filename);
-  }
 }
 
 /// Configuration for dart2dart compiler.
 class Dart2dartCompilerConfiguration extends Dart2xCompilerConfiguration {
   Dart2dartCompilerConfiguration({
       bool isDebug,
       bool isChecked,
       bool isHostChecked,
       bool useSdk})
       : super(
@@ skipping 16 matching lines @@
                 buildDir,
                 CommandBuilder.instance,
                 arguments,
                 environmentOverrides)],
         outputFileName,
         'application/dart');
   }
 
   List<String> computeRuntimeArguments(
       RuntimeConfiguration runtimeConfiguration,
-      String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     // TODO(antonm): support checked.
     return <String>[]
         ..addAll(vmOptions)
         ..add('--ignore-unrecognized-flags')
         ..add(artifact.filename);
@@ skipping 34 matching lines @@
             commandBuilder.getAnalysisCommand(
                 moniker, computeCompilerPath(buildDir), arguments,
                 environmentOverrides,
                 flavor: moniker)],
         null, null); // Since this is not a real compilation, no artifacts are
                      // produced.
   }
 
   List<String> computeRuntimeArguments(
       RuntimeConfiguration runtimeConfiguration,
-      String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     return <String>[];
   }
 }
 
 class DartBasedAnalyzerCompilerConfiguration
     extends AnalyzerCompilerConfiguration {
   DartBasedAnalyzerCompilerConfiguration({
       bool isDebug,
       bool isChecked,
       bool isHostChecked,
       bool useSdk})
       : super(
           'dart2analyzer', isDebug: isDebug, isChecked: isChecked,
           isHostChecked: isHostChecked, useSdk: useSdk);
 
   String computeCompilerPath(String buildDir) => 'editor/tools/analyzer';
 }