Fix vm-kernel-precompilation builders

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 'runtime_configuration.dart' show DartPrecompiledAdbRuntimeConfiguration;
 import 'test_runner.dart' show Command, CommandBuilder, CompilationCommand;
-
 import 'test_suite.dart' show TestInformation, TestUtils;
 
-import 'runtime_configuration.dart' show DartPrecompiledAdbRuntimeConfiguration;
+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;
+    }
+  }
+  return copy;
+}
 
 /// 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 251 matching lines @@
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     List<String> args = [];
     if (isChecked) {
       args.add('--enable_asserts');
       args.add('--enable_type_checks');
     }
 
-    var newOriginalArguments = new List<String>.from(originalArguments);
-    for (var i = 0; i < newOriginalArguments .length; i++) {
-      if (newOriginalArguments[i].endsWith(".dart")) {
-        newOriginalArguments[i] = artifact.filename;
-      }
-    }
+    var newOriginalArguments = replaceDartFileWith(
+        originalArguments, artifact.filename);
 
     return args
       ..addAll(vmOptions)
       ..addAll(sharedOptions)
       ..addAll(newOriginalArguments);
   }
 }
 
 typedef List<String> CompilerArgumentsFunction(
     List<String> globalArguments,
@@ skipping 23 matching lines @@
       assert(filtered.length == 1);
       return filtered;
     });
   }
 
   factory PipelineCommand.runWithPreviousKernelOutput(
       CompilerConfiguration conf) {
     return new PipelineCommand._(conf, (List<String> globalArguments,
                                         String previousOutput) {
       assert(previousOutput.endsWith('.dill'));
-      return []..addAll(globalArguments)..add(previousOutput);
+      return replaceDartFileWith(globalArguments, previousOutput);

[kustermann, 2017/01/18 21:41:01]

This line was the issue.

     });
   }
 
   List<String> extractArguments(List<String> globalArguments,
                                 String previousOutput) {
     return _argumentsFunction(globalArguments, previousOutput);
   }
 }
 
 class ComposedCompilerConfiguration extends CompilerConfiguration {
@@ skipping 380 matching lines @@
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     List<String> args = [];
     if (isChecked) {
       args.add('--enable_asserts');
       args.add('--enable_type_checks');
     }
-    var newOriginalArguments = new List<String>.from(originalArguments);
-    for (var i = 0; i < newOriginalArguments .length; i++) {
-      if (newOriginalArguments[i].endsWith(".dart")) {
-        var dir = artifact.filename;
-        if (runtimeConfiguration is DartPrecompiledAdbRuntimeConfiguration) {
-          // On android the precompiled snapshot will be pushed to a different
-          // directory on the device, use that one instead.
-          dir = DartPrecompiledAdbRuntimeConfiguration.DeviceTestDir;
-        }
-        newOriginalArguments[i] = "$dir/out.aotsnapshot";
-      }
+
+    var dir = artifact.filename;
+    if (runtimeConfiguration is DartPrecompiledAdbRuntimeConfiguration) {
+      // On android the precompiled snapshot will be pushed to a different
+      // directory on the device, use that one instead.
+      dir = DartPrecompiledAdbRuntimeConfiguration.DeviceTestDir;
     }
+    originalArguments = replaceDartFileWith(
+        originalArguments, "$dir/out.aotsnapshot");
+
     return args
       ..addAll(vmOptions)
       ..addAll(sharedOptions)
-      ..addAll(newOriginalArguments);
+      ..addAll(originalArguments);
   }
 }
 
 class Dart2AppSnapshotCompilerConfiguration extends CompilerConfiguration {
   Dart2AppSnapshotCompilerConfiguration({bool isDebug, bool isChecked})
       : super._subclass(isDebug: isDebug, isChecked: isChecked);
 
   int computeTimeoutMultiplier() {
     int multiplier = 2;
     if (isDebug) multiplier *= 4;
@@ skipping 134 matching lines @@
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     return <String>[];
   }
 }