test.py: Report timings by adding up the time of all commands

tools/testing/dart/test_progress.dart

 // Copyright (c) 2013, 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 test_progress;
 
 import "dart:io";
 import "dart:io" as io;
 import "http_server.dart" as http_server;
 import "status_file_parser.dart";
@@ skipping 76 matching lines @@
       }
       if (test.info.hasRuntimeError) {
         output.add('Runtime error expected.');
       }
     }
   }
   for (var i = 0; i < test.commands.length; i++) {
     var command = test.commands[i];
     var commandOutput = test.commandOutputs[command];
     if (commandOutput != null) {
-      output.add("CommandOutput[$i]:");
+      output.add("CommandOutput[${command.displayName}]:");
       if (!commandOutput.diagnostics.isEmpty) {
         String prefix = 'diagnostics:';
         for (var s in commandOutput.diagnostics) {
           output.add('$prefix ${s}');
           prefix = '   ';
         }
       }
       if (!commandOutput.stdout.isEmpty) {
         output.add('');
         output.add('stdout:');
@@ skipping 88 matching lines @@
 
 class SummaryPrinter extends EventListener {
   void allTestsKnown() {
     if (SummaryReport.total > 0) {
       SummaryReport.printReport();
     }
   }
 }
 
 class TimingPrinter extends EventListener {
-  List<TestCase> _tests = <TestCase>[];
+  List<CommandOutput> _commandOutputs = <CommandOutput>[];
   DateTime _startTime;
 
   TimingPrinter(this._startTime);
 
   void done(TestCase testCase) {
-    _tests.add(testCase);
+    for (var commandOutput in testCase.commandOutputs.values) {
+      _commandOutputs.add(commandOutput);
+    }
   }
 
   void allDone() {
-    // TODO: We should take all the commands into account
     Duration d = (new DateTime.now()).difference(_startTime);
     print('\n--- Total time: ${_timeString(d)} ---');
-    _tests.sort((a, b) {
-      Duration aDuration = a.lastCommandOutput.time;
-      Duration bDuration = b.lastCommandOutput.time;
-      return bDuration.inMilliseconds - aDuration.inMilliseconds;
+    _commandOutputs.sort((a, b) {
+      return b.time.inMilliseconds - a.time.inMilliseconds;
     });
-    for (int i = 0; i < 20 && i < _tests.length; i++) {
-      var name = _tests[i].displayName;
-      var duration = _tests[i].lastCommandOutput.time;
-      var configuration = _tests[i].configurationString;
-      print('${duration} - $configuration $name');
+    for (int i = 0; i < 20 && i < _commandOutputs.length; i++) {
+      var commandOutput = _commandOutputs[i];
+      var command = commandOutput.command;
+      var testCase = commandOutput.testCase;
+      var duration = commandOutput.time;
+      var configuration = testCase.configurationString;
+      print('${commandOutput.time} - $configuration'
+            ' - ${testCase.displayName} (${command.displayName})');
     }
   }
 }
 
 class StatusFileUpdatePrinter extends EventListener {
   var statusToConfigs = new Map<String, List<String>>();
   var _failureSummary = <String>[];
 
   void done(TestCase test) {
     if (test.lastCommandOutput.unexpectedOutput) {
@@ skipping 298 matching lines @@
       return new VerboseProgressIndicator(startTime);
     case 'status':
       return new ProgressIndicator(startTime);
     case 'buildbot':
       return new BuildbotProgressIndicator(startTime);
     default:
       assert(false);
       break;
   }
 }