Pass command line options of tests to precompiled runtime correctly.

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 330 matching lines @@
 
 class VmCommand extends ProcessCommand {
   VmCommand._(String executable, List<String> arguments,
       Map<String, String> environmentOverrides)
       : super._("vm", executable, arguments, environmentOverrides);
 }
 
 class AdbPrecompilationCommand extends Command {
   final String precompiledRunnerFilename;
   final String precompiledTestDirectory;
+  final List<String> arguments;
   final bool useBlobs;
 
   AdbPrecompilationCommand._(this.precompiledRunnerFilename,
                              this.precompiledTestDirectory,
+                             this.arguments,
                              this.useBlobs)
       : super._("adb_precompilation");
 
   void _buildHashCode(HashCodeBuilder builder) {
     super._buildHashCode(builder);
     builder.add(precompiledRunnerFilename);
     builder.add(precompiledTestDirectory);
+    builder.add(arguments);
     builder.add(useBlobs);
   }
 
   bool _equal(AdbPrecompilationCommand other) =>
       super._equal(other) &&
       precompiledRunnerFilename == other.precompiledRunnerFilename &&
       useBlobs == other.useBlobs &&
       precompiledTestDirectory == other.precompiledTestDirectory;

[kustermann, 2016/05/18 18:41:15]

You should probably also add "arguments" here (deeply) as well.

[Florian Schneider, 2016/05/18 18:55:31]

Done.

 
   String toString() => 'Steps to push precompiled runner and precompiled code '
                        'to an attached device. Uses (and requires) adb.';
 }
 
 class JSCommandlineCommand extends ProcessCommand {
   JSCommandlineCommand._(
       String displayName, String executable, List<String> arguments,
       [Map<String, String> environmentOverrides = null])
       : super._(displayName, executable, arguments, environmentOverrides);
@@ skipping 253 matching lines @@
   }
 
   VmCommand getVmCommand(String executable, List<String> arguments,
       Map<String, String> environmentOverrides) {
     var command = new VmCommand._(executable, arguments, environmentOverrides);
     return _getUniqueCommand(command);
   }
 
   AdbPrecompilationCommand getAdbPrecompiledCommand(String precompiledRunner,
                                                     String testDirectory,
+                                                    List<String> arguments,
                                                     bool useBlobs) {
     var command = new AdbPrecompilationCommand._(
-        precompiledRunner, testDirectory, useBlobs);
+        precompiledRunner, testDirectory, arguments, useBlobs);
     return _getUniqueCommand(command);
   }
 
   Command getJSCommandlineCommand(String displayName, executable, arguments,
       [environment = null]) {
     var command = new JSCommandlineCommand._(
         displayName, executable, arguments, environment);
     return _getUniqueCommand(command);
   }
 
@@ skipping 1855 matching lines @@
       });
     } else {
       return new RunningProcess(command, timeout).run();
     }
   }
 
   Future<CommandOutput> _runAdbPrecompilationCommand(
       AdbDevice device, AdbPrecompilationCommand command, int timeout) async {
     var runner = command.precompiledRunnerFilename;
     var testdir = command.precompiledTestDirectory;
+    var arguments = command.arguments;
     var devicedir = '/data/local/tmp/precompilation-testing';
     var deviceTestDir = '/data/local/tmp/precompilation-testing/test';
 
     // We copy all the files which the vm precompiler puts into the test
     // directory.
     List<String> files = new io.Directory(testdir)
         .listSync()
         .where((fse) => fse is io.File)
         .map((file) => file.path)
         .map((path) => path.substring(path.lastIndexOf('/') + 1))
@@ skipping 18 matching lines @@
 
     for (var file in files) {
       steps.add(() => device.runAdbCommand(
             ['push', '$testdir/$file', '$deviceTestDir/$file']));
     }
 
     if (command.useBlobs) {
       steps.add(() => device.runAdbShellCommand(
             ['$devicedir/dart_precompiled_runtime',
              '--run-app-snapshot=$deviceTestDir',
-             '--use-blobs', 'ignored.dart'],
+             '--use-blobs']..addAll(arguments),
             timeout: timeoutDuration));
     } else {
       steps.add(() => device.runAdbShellCommand(
             ['$devicedir/dart_precompiled_runtime',
-             '--run-app-snapshot=$deviceTestDir',
-             'ignored.dart'],
+             '--run-app-snapshot=$deviceTestDir'
+             ]..addAll(arguments),
             timeout: timeoutDuration));
     }
 
     var stopwatch = new Stopwatch()..start();
     var writer = new StringBuffer();
 
     await device.waitForBootCompleted();
     await device.waitForDevice();
 
     AdbCommandResult result;
@@ skipping 445 matching lines @@
     }
   }
 
   void eventAllTestsDone() {
     for (var listener in _eventListener) {
       listener.allDone();
     }
     _allDone();
   }
 }