Simplify Command classes.

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 'runtime_configuration.dart';
-import 'test_runner.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 116 matching lines @@
 
   bool get hasCompiler => true;
 
   String get executableScriptSuffix => Platform.isWindows ? '.bat' : '';
 
   // TODO(ahe): Remove this.
   bool get isCsp => false;
 
   List<Uri> bootstrapDependencies(String buildDir) => const <Uri>[];
 
-  CommandArtifact computeCompilationArtifact(
-      String buildDir,
-      String tempDir,
-      CommandBuilder commandBuilder,
-      List<String> arguments,
-      Map<String, String> environmentOverrides) {
+  CommandArtifact computeCompilationArtifact(String buildDir, String tempDir,
+      List<String> arguments, Map<String, String> environmentOverrides) {
     return new CommandArtifact([], null, null);
   }
 
   List<String> computeCompilerArguments(
       List<String> vmOptions, List<String> sharedOptions, List<String> args) {
     return sharedOptions.toList()..addAll(args);
   }
 
   List<String> computeRuntimeArguments(
       RuntimeConfiguration runtimeConfiguration,
@@ skipping 70 matching lines @@
       this.strong,
       this.treeShake})
       : super._subclass(
             isChecked: isChecked, isHostChecked: isHostChecked, useSdk: useSdk);
 
   @override
   String computeCompilerPath(String buildDir) {
     return 'tools/dartk_wrappers/dartk$executableScriptSuffix';
   }
 
-  CompilationCommand computeCompilationCommand(
-      String outputFileName,
-      String buildDir,
-      CommandBuilder commandBuilder,
-      List<String> arguments,
-      Map<String, String> environmentOverrides) {
+  Command computeCompilationCommand(String outputFileName, String buildDir,
+      List<String> arguments, Map<String, String> environmentOverrides) {
     Iterable<String> extraArguments = [
       '--sdk',
       '$buildDir/patched_sdk',
       '--link',
       '--target=vm',
       treeShake ? '--tree-shake' : null,
       strong ? '--strong' : null,
       verify ? '--verify-ir' : null,
       '--out',
       outputFileName
     ].where((x) => x != null);
-    return commandBuilder.getKernelCompilationCommand(
-        'dartk',
+    return Command.kernelCompilation(
         outputFileName,
         true,
         bootstrapDependencies(buildDir),
         computeCompilerPath(buildDir),
         <String>[]..addAll(arguments)..addAll(extraArguments),
         environmentOverrides);
   }
 
-  CommandArtifact computeCompilationArtifact(
-      String buildDir,
-      String tempDir,
-      CommandBuilder commandBuilder,
-      List<String> arguments,
-      Map<String, String> environmentOverrides) {
-    return new CommandArtifact(<Command>[
-      computeCompilationCommand('$tempDir/out.dill', buildDir,
-          CommandBuilder.instance, arguments, environmentOverrides)
+  CommandArtifact computeCompilationArtifact(String buildDir, String tempDir,
+      List<String> arguments, Map<String, String> environmentOverrides) {
+    return new CommandArtifact([
+      computeCompilationCommand(
+          '$tempDir/out.dill', buildDir, arguments, environmentOverrides)
     ], '$tempDir/out.dill', 'application/dart');
   }
 
   List<String> computeRuntimeArguments(
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
@@ skipping 56 matching lines @@
       List<String> globalArguments, String previousOutput) {
     return _argumentsFunction(globalArguments, previousOutput);
   }
 }
 
 class ComposedCompilerConfiguration extends CompilerConfiguration {
   final List<PipelineCommand> pipelineCommands;
 
   ComposedCompilerConfiguration(this.pipelineCommands) : super._subclass();
 
-  CommandArtifact computeCompilationArtifact(
-      String buildDir,
-      String tempDir,
-      CommandBuilder commandBuilder,
-      List<String> globalArguments,
-      Map<String, String> environmentOverrides) {
+  CommandArtifact computeCompilationArtifact(String buildDir, String tempDir,
+      List<String> globalArguments, Map<String, String> environmentOverrides) {
     List<Command> allCommands = [];
 
     // The first compilation command is as usual.
     var arguments = pipelineCommands[0].extractArguments(globalArguments, null);
     CommandArtifact artifact = pipelineCommands[0]
         .compilerConfiguration
         .computeCompilationArtifact(
-            buildDir, tempDir, commandBuilder, arguments, environmentOverrides);
+            buildDir, tempDir, arguments, environmentOverrides);
     allCommands.addAll(artifact.commands);
 
     // The following compilation commands are based on the output of the
     // previous one.
     for (int i = 1; i < pipelineCommands.length; i++) {
       PipelineCommand pc = pipelineCommands[i];
 
       arguments = pc.extractArguments(globalArguments, artifact.filename);
       artifact = pc.compilerConfiguration.computeCompilationArtifact(
-          buildDir, tempDir, commandBuilder, arguments, environmentOverrides);
+          buildDir, tempDir, arguments, environmentOverrides);
 
       allCommands.addAll(artifact.commands);
     }
 
     return new CommandArtifact(
         allCommands, artifact.filename, artifact.mimeType);
   }
 
   List<String> computeCompilerArguments(vmOptions, sharedOptions, args) {
     // The result will be passed as an input to [extractArguments]
@@ skipping 94 matching lines @@
       // "$buildDir/dart-sdk/bin/"
       return '$prefix/dart2js_developer$suffix';
     } else {
       if (useSdk) {
         prefix = '$buildDir/dart-sdk/bin';
       }
       return '$prefix/dart2js$suffix';
     }
   }
 
-  CompilationCommand computeCompilationCommand(
-      String outputFileName,
-      String buildDir,
-      CommandBuilder commandBuilder,
-      List<String> arguments,
-      Map<String, String> environmentOverrides) {
+  Command computeCompilationCommand(String outputFileName, String buildDir,
+      List<String> arguments, Map<String, String> environmentOverrides) {
     arguments = arguments.toList();
     arguments.add('--out=$outputFileName');
 
-    return commandBuilder.getCompilationCommand(
+    return Command.compilation(
         moniker,
         outputFileName,
         !useSdk,
         bootstrapDependencies(buildDir),
         computeCompilerPath(buildDir),
         arguments,
         environmentOverrides);
   }
 
   List<Uri> bootstrapDependencies(String buildDir) {
@@ skipping 31 matching lines @@
             useSdk: useSdk);
 
   int get timeoutMultiplier {
     var multiplier = 1;
     if (isDebug) multiplier *= 4;
     if (isChecked) multiplier *= 2;
     if (isHostChecked) multiplier *= 16;
     return multiplier;
   }
 
-  CommandArtifact computeCompilationArtifact(
-      String buildDir,
-      String tempDir,
-      CommandBuilder commandBuilder,
-      List<String> arguments,
-      Map<String, String> environmentOverrides) {
+  CommandArtifact computeCompilationArtifact(String buildDir, String tempDir,
+      List<String> arguments, Map<String, String> environmentOverrides) {
     var compilerArguments = arguments.toList()..addAll(extraDart2jsOptions);
     return new CommandArtifact([
-      this.computeCompilationCommand('$tempDir/out.js', buildDir,
-          CommandBuilder.instance, compilerArguments, environmentOverrides)
+      computeCompilationCommand(
+          '$tempDir/out.js', buildDir, compilerArguments, environmentOverrides)
     ], '$tempDir/out.js', 'application/javascript');
   }
 
   List<String> computeRuntimeArguments(
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
@@ skipping 23 matching lines @@
       this.useDfe: false})
       : super._subclass(isDebug: isDebug, isChecked: isChecked);
 
   int get timeoutMultiplier {
     var multiplier = 2;
     if (isDebug) multiplier *= 4;
     if (isChecked) multiplier *= 2;
     return multiplier;
   }
 
-  CommandArtifact computeCompilationArtifact(
-      String buildDir,
-      String tempDir,
-      CommandBuilder commandBuilder,
-      List<String> arguments,
-      Map<String, String> environmentOverrides) {
+  CommandArtifact computeCompilationArtifact(String buildDir, String tempDir,
+      List<String> arguments, Map<String, String> environmentOverrides) {
     var commands = new List<Command>();
-    commands.add(this.computeCompilationCommand(tempDir, buildDir,
-        CommandBuilder.instance, arguments, environmentOverrides));
+    commands.add(this.computeCompilationCommand(
+        tempDir, buildDir, arguments, environmentOverrides));
     if (!useBlobs) {
-      commands.add(this.computeAssembleCommand(tempDir, buildDir,
-          CommandBuilder.instance, arguments, environmentOverrides));
-      commands.add(this.computeRemoveAssemblyCommand(tempDir, buildDir,
-          CommandBuilder.instance, arguments, environmentOverrides));
+      commands.add(this.computeAssembleCommand(
+          tempDir, buildDir, arguments, environmentOverrides));
+      commands.add(this.computeRemoveAssemblyCommand(
+          tempDir, buildDir, arguments, environmentOverrides));
     }
     return new CommandArtifact(
         commands, '$tempDir', 'application/dart-precompiled');
   }
 
-  CompilationCommand computeCompilationCommand(
-      String tempDir,
-      String buildDir,
-      CommandBuilder commandBuilder,
-      List<String> arguments,
-      Map<String, String> environmentOverrides) {
+  Command computeCompilationCommand(String tempDir, String buildDir,
+      List<String> arguments, Map<String, String> environmentOverrides) {
     String exec;
     if (isAndroid) {
       if (arch == Architecture.arm) {
         exec = "$buildDir/clang_x86/dart_bootstrap";
       } else if (arch == Architecture.arm64) {
         exec = "$buildDir/clang_x64/dart_bootstrap";
       }
     } else {
       exec = "$buildDir/dart_bootstrap";
     }
     var args = <String>[];
     if (useDfe) {
       args.add('--dfe=utils/kernel-service/kernel-service.dart');
       args.add('--platform=${buildDir}/patched_sdk/platform.dill');
     }
     args.add("--snapshot-kind=app-aot");
     if (useBlobs) {
       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 commandBuilder.getCompilationCommand('precompiler', tempDir, !useSdk,
+    return Command.compilation('precompiler', tempDir, !useSdk,
         bootstrapDependencies(buildDir), exec, args, environmentOverrides);
   }
 
-  CompilationCommand computeAssembleCommand(
-      String tempDir,
-      String buildDir,
-      CommandBuilder commandBuilder,
-      List arguments,
-      Map<String, String> environmentOverrides) {
+  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";
       } else if (arch == Architecture.arm64) {
         triple = "aarch64-linux-android";
       }
       String host;
@@ skipping 41 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 commandBuilder.getCompilationCommand('assemble', tempDir, !useSdk,
+    return Command.compilation('assemble', tempDir, !useSdk,
         bootstrapDependencies(buildDir), exec, args, environmentOverrides);
   }
 
   // This step reduces the amount of space needed to run the precompilation
   // tests by 60%.
-  CompilationCommand computeRemoveAssemblyCommand(
-      String tempDir,
-      String buildDir,
-      CommandBuilder commandBuilder,
-      List arguments,
-      Map<String, String> environmentOverrides) {
+  Command computeRemoveAssemblyCommand(String tempDir, String buildDir,
+      List arguments, Map<String, String> environmentOverrides) {
     var exec = 'rm';
     var args = ['$tempDir/out.S'];
 
-    return commandBuilder.getCompilationCommand(
-        'remove_assembly',
-        tempDir,
-        !useSdk,
-        bootstrapDependencies(buildDir),
-        exec,
-        args,
-        environmentOverrides);
+    return Command.compilation('remove_assembly', tempDir, !useSdk,
+        bootstrapDependencies(buildDir), exec, args, environmentOverrides);
   }
 
   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 45 matching lines @@
   AppJitCompilerConfiguration({bool isDebug, bool isChecked})
       : super._subclass(isDebug: isDebug, isChecked: isChecked);
 
   int get timeoutMultiplier {
     var multiplier = 1;
     if (isDebug) multiplier *= 2;
     if (isChecked) multiplier *= 2;
     return multiplier;
   }
 
-  CommandArtifact computeCompilationArtifact(
-      String buildDir,
-      String tempDir,
-      CommandBuilder commandBuilder,
-      List<String> arguments,
-      Map<String, String> environmentOverrides) {
+  CommandArtifact computeCompilationArtifact(String buildDir, String tempDir,
+      List<String> arguments, Map<String, String> environmentOverrides) {
     var snapshot = "$tempDir/out.jitsnapshot";
-    return new CommandArtifact(<Command>[
-      this.computeCompilationCommand(tempDir, buildDir, CommandBuilder.instance,
-          arguments, environmentOverrides)
+    return new CommandArtifact([
+      computeCompilationCommand(
+          tempDir, buildDir, arguments, environmentOverrides)
     ], snapshot, 'application/dart-snapshot');
   }
 
-  CompilationCommand computeCompilationCommand(
-      String tempDir,
-      String buildDir,
-      CommandBuilder commandBuilder,
-      List<String> arguments,
-      Map<String, String> environmentOverrides) {
+  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 commandBuilder.getCompilationCommand('app_jit', tempDir, !useSdk,
+    return Command.compilation('app_jit', tempDir, !useSdk,
         bootstrapDependencies(buildDir), exec, args, environmentOverrides);
   }
 
   List<String> computeCompilerArguments(
       vmOptions, sharedOptions, originalArguments) {
     var args = <String>[];
     if (isChecked) {
       args.add('--enable_asserts');
       args.add('--enable_type_checks');
     }
@@ skipping 53 matching lines @@
       // shipped SDK, that is the script is not installed in
       // "$buildDir/dart-sdk/bin/"
       return '$prefix/dartanalyzer_developer$suffix';
     }
     if (useSdk) {
       prefix = '$buildDir/dart-sdk/bin';
     }
     return '$prefix/dartanalyzer$suffix';
   }
 
-  CommandArtifact computeCompilationArtifact(
-      String buildDir,
-      String tempDir,
-      CommandBuilder commandBuilder,
-      List<String> arguments,
-      Map<String, String> environmentOverrides) {
+  CommandArtifact computeCompilationArtifact(String buildDir, String tempDir,
+      List<String> arguments, Map<String, String> environmentOverrides) {
     arguments = arguments.toList();
     if (isChecked || isStrong) {
       arguments.add('--enable_type_checks');
     }
     if (isStrong) {
       arguments.add('--strong');
     }
     return new CommandArtifact([
-      commandBuilder.getAnalysisCommand('dart2analyzer',
-          computeCompilerPath(buildDir), arguments, environmentOverrides,
-          flavor: 'dart2analyzer')
+      Command.analysis(
+          computeCompilerPath(buildDir), arguments, environmentOverrides)
     ], 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>[];
   }
 }