Add support for timeouts when using AdbPrecompilationCommand

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 2486 matching lines @@
       return _getBatchRunner("dart2js")
           .runCommand("dart2js", command, timeout, command.arguments);
     } else if (command is AnalysisCommand && batchMode) {
       return _getBatchRunner(command.flavor)
           .runCommand(command.flavor, command, timeout, command.arguments);
     } else if (command is ScriptCommand) {
       return command.run();
     } else if (command is AdbPrecompilationCommand) {
       assert(adbDevicePool != null);
       return adbDevicePool.acquireDevice().then((AdbDevice device) {
-        return _runAdbPrecompilationCommand(device, command).whenComplete(() {
+        return _runAdbPrecompilationCommand(
+            device, command, timeout).whenComplete(() {
           adbDevicePool.releaseDevice(device);
         });
       });
     } else {
       return new RunningProcess(command, timeout).run();
     }
   }
 
   Future<CommandOutput> _runAdbPrecompilationCommand(
-      AdbDevice device, AdbPrecompilationCommand command) async {
+      AdbDevice device, AdbPrecompilationCommand command, int timeout) async {
     var runner = command.precompiledRunnerFilename;
     var testdir = command.precompiledTestDirectory;
     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))
         .toList();
 
+    var timeoutDuration = new Duration(seconds: timeout);
+
     // All closures are of type "Future<AdbCommandResult> run()"
     List<Function> steps = [];
 
     steps.add(() => device.runAdbShellCommand(
           ['rm', '-Rf', deviceTestDir]));
     steps.add(() => device.runAdbShellCommand(
           ['mkdir', '-p', deviceTestDir]));
     // TODO: We should find a way for us to cache the runner binary and avoid
     // pushhing it for every single test (this is bad for SSD cycle time, test
     // timing).
     steps.add(() => device.runAdbCommand(
           ['push', runner, '$devicedir/runner']));
     steps.add(() => device.runAdbShellCommand(
           ['chmod', '777', '$devicedir/runner']));
 
     for (var file in files) {
       steps.add(() => device.runAdbCommand(
             ['push', '$testdir/$file', '$deviceTestDir/$file']));
     }
 
     if (command.useBlobs) {
       steps.add(() => device.runAdbShellCommand(
             ['$devicedir/runner', '--run-precompiled-snapshot=$deviceTestDir',
-             '--use_blobs', 'ignored.dart']));
+             '--use_blobs', 'ignored.dart'], timeout: timeoutDuration));
     } else {
       steps.add(() => device.runAdbShellCommand(
             ['$devicedir/runner', '--run-precompiled-snapshot=$deviceTestDir',
-             'ignored.dart']));
+             'ignored.dart'], timeout: timeoutDuration));
     }
 
     var stopwatch = new Stopwatch()..start();
     var writer = new StringBuffer();
 
     await device.waitForBootCompleted();
     await device.waitForDevice();
 
     AdbCommandResult result;
     for (var i = 0; i < steps.length; i++) {
@@ skipping 10 matching lines @@
       }
       writer.writeln("ExitCode: ${result.exitCode}");
       writer.writeln("Time: ${commandStopwatch.elapsed}");
       writer.writeln("");
 
       // If one command fails, we stop processing the others and return
       // immediately.
       if (result.exitCode != 0) break;
     }
     return createCommandOutput(
-        command, result.exitCode, false, UTF8.encode('$writer'),
+        command, result.exitCode, result.timedOut, UTF8.encode('$writer'),
         [], stopwatch.elapsed, false);
   }
 
   BatchRunnerProcess _getBatchRunner(String identifier) {
     // Start batch processes if needed
     var runners = _batchProcesses[identifier];
     if (runners == null) {
       runners = new List<BatchRunnerProcess>(maxProcesses);
       for (int i = 0; i < maxProcesses; i++) {
         runners[i] = new BatchRunnerProcess();
@@ skipping 413 matching lines @@
     }
   }
 
   void eventAllTestsDone() {
     for (var listener in _eventListener) {
       listener.allDone();
     }
     _allDone();
   }
 }