Basic support for dev_compiler in test.dart.

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.
 
 import 'dart:io';
 
 import 'command.dart';
 import 'configuration.dart';
+import 'path.dart';
 import 'runtime_configuration.dart';
 import 'test_suite.dart';
 import 'utils.dart';
 
 List<String> replaceDartFileWith(List<String> list, String replacement) {
   var copy = new List<String>.from(list);
   for (var i = 0; i < copy.length; i++) {
     if (copy[i].endsWith(".dart")) {
       copy[i] = replacement;
     }
@@ skipping 47 matching lines @@
         return new Dart2jsCompilerConfiguration(
             isDebug: configuration.mode.isDebug,
             isChecked: configuration.isChecked,
             isHostChecked: configuration.isHostChecked,
             useSdk: configuration.useSdk,
             isCsp: configuration.isCsp,
             useFastStartup: configuration.useFastStartup,
             useKernel: configuration.useDart2JSWithKernel,
             extraDart2jsOptions: configuration.dart2jsOptions);
 
+      case Compiler.dartdevc:
+        return new DartdevcCompilerConfiguration(
+            isDebug: configuration.mode.isDebug,
+            isChecked: configuration.isChecked,
+            isHostChecked: configuration.isHostChecked);
+        break;
+
       case Compiler.appJit:
         return new AppJitCompilerConfiguration(
             isDebug: configuration.mode.isDebug,
             isChecked: configuration.isChecked);
 
       case Compiler.precompiler:
         return new PrecompilerCompilerConfiguration(
             isDebug: configuration.mode.isDebug,
             isChecked: configuration.isChecked,
             arch: configuration.architecture,
@@ skipping 387 matching lines @@
   }
 
   Command computeCompilationCommand(String outputFileName, String buildDir,
       List<String> arguments, Map<String, String> environmentOverrides) {
     arguments = arguments.toList();
     arguments.add('--out=$outputFileName');
 
     return Command.compilation(
         moniker,
         outputFileName,
-        !useSdk,
         bootstrapDependencies(buildDir),
         computeCompilerPath(buildDir),
         arguments,
-        environmentOverrides);
+        environmentOverrides,
+        alwaysCompile: !useSdk);
   }
 
   List<Uri> bootstrapDependencies(String buildDir) {
     if (!useSdk) return const <Uri>[];
     return _bootstrapDependenciesCache.putIfAbsent(
         buildDir,
         () => [
               Uri.base
                   .resolveUri(nativeDirectoryToUri(buildDir))
                   .resolve('dart-sdk/bin/snapshots/dart2js.dart.snapshot')
@@ skipping 51 matching lines @@
     Uri sdk = useSdk
         ? nativeDirectoryToUri(buildDir).resolve('dart-sdk/')
         : nativeDirectoryToUri(TestUtils.dartDir.toNativePath())
             .resolve('sdk/');
     Uri preambleDir = sdk.resolve('lib/_internal/js_runtime/lib/preambles/');
     return runtimeConfiguration.dart2jsPreambles(preambleDir)
       ..add(artifact.filename);
   }
 }
 
+/// Configuration for dart2js compiler.
+class DartdevcCompilerConfiguration extends CompilerConfiguration {
+  DartdevcCompilerConfiguration(
+      {bool isDebug, bool isChecked, bool isHostChecked})
+      : super._subclass(
+            isDebug: isDebug,
+            isChecked: isChecked,
+            isHostChecked: isHostChecked,
+            useSdk: true);
+
+  String computeCompilerPath(String buildDir) {
+    var dir = useSdk ? "$buildDir/dart-sdk" : "sdk";

[Bill Hesse, 2017/06/21 16:33:20]

This is not currently reachable (the non-sdk case), so if it isn't working, it
should at least have a TODO here.

[Bob Nystrom, 2017/06/21 20:18:28]

Good catch. I think I wrote this before I required useSdk. Removed the non-SDK
case.

+    return "$dir/bin/dartdevc$executableScriptSuffix";
+  }
+
+  CommandArtifact computeCompilationArtifact(String buildDir, String tempDir,
+      List<String> arguments, Map<String, String> environmentOverrides) {
+    // TODO(rnystrom): There is a lot of overlap between this code and
+    // _dartdevcCompileCommand() in test_suite.dart. This code path is only hit
+    // when the test is expected to have a compile error. Consider refactoring
+    // to unify the two (and likewise for dart2js).
+
+    // TODO(rnystrom): Are there other arguments here that we need to keep?
+    // What about arguments specified in the test itself?
+    var inputFile = arguments.last;
+
+    var compilerArguments = [
+      "--dart-sdk",
+      "$buildDir/dart-sdk",
+      "--library-root",
+      new Path(inputFile).directoryPath.toString(),
+      "-o",
+      "$tempDir/out.js",
+      inputFile
+    ];
+
+    var command = Command.compilation(
+        Compiler.dartdevc.name,
+        "$tempDir/out.js",
+        bootstrapDependencies(buildDir),
+        computeCompilerPath(buildDir),
+        compilerArguments,
+        environmentOverrides);
+
+    return new CommandArtifact(
+        [command], "$tempDir/out.js", "application/javascript");
+  }
+}
+
 class PrecompilerCompilerConfiguration extends CompilerConfiguration {
   final Architecture arch;
   final bool useBlobs;
   final bool isAndroid;
   final bool useDfe;
 
   PrecompilerCompilerConfiguration(
       {bool isDebug,
       bool isChecked,
       this.arch,
@@ skipping 46 matching lines @@
       args.add("--snapshot=$tempDir/out.aotsnapshot");
       args.add("--use-blobs");
     } else {
       args.add("--snapshot=$tempDir/out.S");
     }
     if (isAndroid && arch == Architecture.arm) {
       args.add('--no-sim-use-hardfp');
     }
     args.addAll(arguments);
 
-    return Command.compilation('precompiler', tempDir, !useSdk,
-        bootstrapDependencies(buildDir), exec, args, environmentOverrides);
+    return Command.compilation('precompiler', tempDir,
+        bootstrapDependencies(buildDir), exec, args, environmentOverrides,
+        alwaysCompile: !useSdk);
   }
 
   Command computeAssembleCommand(String tempDir, String buildDir,
       List arguments, Map<String, String> environmentOverrides) {
     String cc, shared, ldFlags;
     if (isAndroid) {
       var ndk = "third_party/android_tools/ndk";
       String triple;
       if (arch == Architecture.arm) {
         triple = "arm-linux-androideabi";
@@ skipping 45 matching lines @@
     var exec = cc;
     var args = <String>[];
     if (ccFlags != null) args.add(ccFlags);
     if (ldFlags != null) args.add(ldFlags);
     args.add(shared);
     args.add('-nostdlib');
     args.add('-o');
     args.add('$tempDir/out.aotsnapshot');
     args.add('$tempDir/out.S');
 
-    return Command.compilation('assemble', tempDir, !useSdk,
-        bootstrapDependencies(buildDir), exec, args, environmentOverrides);
+    return Command.compilation('assemble', tempDir,
+        bootstrapDependencies(buildDir), exec, args, environmentOverrides,
+        alwaysCompile: !useSdk);
   }
 
   // This step reduces the amount of space needed to run the precompilation
   // tests by 60%.
   Command computeRemoveAssemblyCommand(String tempDir, String buildDir,
       List arguments, Map<String, String> environmentOverrides) {
     var exec = 'rm';
     var args = ['$tempDir/out.S'];
 
-    return Command.compilation('remove_assembly', tempDir, !useSdk,
-        bootstrapDependencies(buildDir), exec, args, environmentOverrides);
+    return Command.compilation('remove_assembly', tempDir,
+        bootstrapDependencies(buildDir), exec, args, environmentOverrides,
+        alwaysCompile: !useSdk);
   }
 
   List<String> filterVmOptions(List<String> vmOptions) {
     var filtered = vmOptions.toList();
     filtered.removeWhere(
         (option) => option.startsWith("--optimization-counter-threshold"));
     filtered.removeWhere(
         (option) => option.startsWith("--optimization_counter_threshold"));
     return filtered;
   }
@@ skipping 61 matching lines @@
     ], snapshot, 'application/dart-snapshot');
   }
 
   Command computeCompilationCommand(String tempDir, String buildDir,
       List<String> arguments, Map<String, String> environmentOverrides) {
     var exec = "$buildDir/dart";
     var snapshot = "$tempDir/out.jitsnapshot";
     var args = ["--snapshot=$snapshot", "--snapshot-kind=app-jit"];
     args.addAll(arguments);
 
-    return Command.compilation('app_jit', tempDir, !useSdk,
-        bootstrapDependencies(buildDir), exec, args, environmentOverrides);
+    return Command.compilation('app_jit', tempDir,
+        bootstrapDependencies(buildDir), exec, args, environmentOverrides,
+        alwaysCompile: !useSdk);
   }
 
   List<String> computeCompilerArguments(
       vmOptions, sharedOptions, originalArguments) {
     var args = <String>[];
     if (isChecked) {
       args.add('--enable_asserts');
       args.add('--enable_type_checks');
     }
     return args
@@ skipping 79 matching lines @@
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     return <String>[];
   }
 }