Refactoring of ProgressIndicator

tools/testing/dart/test_progress.dart

Index: tools/testing/dart/test_progress.dart
diff --git a/tools/testing/dart/test_progress.dart b/tools/testing/dart/test_progress.dart
index b6d5d29683acdc9d4b274fa8e03639bcf510b1c8..23f74157dfb10d9391a69405db48d914b8b68283 100644
--- a/tools/testing/dart/test_progress.dart
+++ b/tools/testing/dart/test_progress.dart
@@ -12,42 +12,138 @@ import "test_runner.dart";
 import "test_suite.dart";

[ricow1, 2013/03/12 10:31:47]

Martin: for future reference, stuff like this is easier to review if you
annotate what methods are just verbatim copy/move

 import "utils.dart";
 
-class ProgressIndicator {
-  ProgressIndicator(this._startTime, this._printTiming)
-      : _tests = [], _failureSummary = [];
+String _pad(String s, int length) {
+  StringBuffer buffer = new StringBuffer();
+  for (int i = s.length; i < length; i++) {
+    buffer.add(' ');
+  }
+  buffer.add(s);
+  return buffer.toString();
+}
 
-  factory ProgressIndicator.fromName(String name,
-                                     Date startTime,
-                                     bool printTiming) {
-    switch (name) {
-      case 'compact':
-        return new CompactProgressIndicator(startTime, printTiming);
-      case 'color':
-        return new ColorProgressIndicator(startTime, printTiming);
-      case 'line':
-        return new LineProgressIndicator(startTime, printTiming);
-      case 'verbose':
-        return new VerboseProgressIndicator(startTime, printTiming);
-      case 'silent':
-        return new SilentProgressIndicator(startTime, printTiming);
-      case 'status':
-        return new StatusProgressIndicator(startTime, printTiming);
-      case 'buildbot':
-        return new BuildbotProgressIndicator(startTime, printTiming);
-      case 'diff':
-        return new DiffProgressIndicator(startTime, printTiming);
-      default:
-        assert(false);
-        break;
+String _padTime(int time) {
+  if (time == 0) {
+    return '00';
+  } else if (time < 10) {
+    return '0$time';
+  } else {
+    return '$time';
+  }
+}
+
+String _timeString(Duration d) {
+  var min = d.inMinutes;
+  var sec = d.inSeconds % 60;
+  return '${_padTime(min)}:${_padTime(sec)}';
+}
+
+class Formatter {
+  const Formatter();
+  String passed(msg) => msg;
+  String failed(msg) => msg;
+}
+
+class ColorFormatter extends Formatter {
+  static int BOLD = 1;
+  static int GREEN = 32;
+  static int RED = 31;
+  static int NONE = 0;
+  static String ESCAPE = decodeUtf8([27]);
+
+  String passed(String msg) => _color(msg, GREEN);
+  String failed(String msg) => _color(msg, RED);
+
+  static String _color(String msg, int color) {
+    return "$ESCAPE[${color}m$msg$ESCAPE[0m";
+  }
+}
+
+
+List<String> _buildFailureOutput(TestCase test,
+                                 [Formatter formatter = const Formatter()]) {
+  List<String> output = new List<String>();
+  output.add('');
+  output.add(formatter.failed('FAILED: ${test.configurationString}'
+                              ' ${test.displayName}'));
+  StringBuffer expected = new StringBuffer();
+  expected.add('Expected: ');
+  for (var expectation in test.expectedOutcomes) {
+    expected.add('$expectation ');
+  }
+  output.add(expected.toString());
+  output.add('Actual: ${test.lastCommandOutput.result}');
+  if (!test.lastCommandOutput.hasTimedOut && test.info != null) {
+    if (test.lastCommandOutput.incomplete && !test.info.hasCompileError) {
+      output.add('Unexpected compile-time error.');
+    } else {
+      if (test.info.hasCompileError) {
+        output.add('Compile-time error expected.');
+      }
+      if (test.info.hasRuntimeError) {
+        output.add('Runtime error expected.');
+      }
+    }
+  }
+  if (!test.lastCommandOutput.diagnostics.isEmpty) {
+    String prefix = 'diagnostics:';
+    for (var s in test.lastCommandOutput.diagnostics) {
+      output.add('$prefix ${s}');
+      prefix = '   ';
     }
   }
+  if (!test.lastCommandOutput.stdout.isEmpty) {
+    output.add('');
+    output.add('stdout:');
+    if (test.lastCommandOutput.command.isPixelTest) {
+      output.add('DRT pixel test failed! stdout is not printed because it '
+                 'contains binary data!');
+    } else {
+      output.add(decodeUtf8(test.lastCommandOutput.stdout));
+    }
+  }
+  if (!test.lastCommandOutput.stderr.isEmpty) {
+    output.add('');
+    output.add('stderr:');
+    output.add(decodeUtf8(test.lastCommandOutput.stderr));
+  }
+  if (test is BrowserTestCase) {
+    // Additional command for rerunning the steps locally after the fact.
+    var command =
+      test.configuration["_servers_"].httpServerCommandline();
+    output.add('To retest, run:  $command');
+  }
+  for (Command c in test.commands) {
+    output.add('');
+    String message = (c == test.commands.last
+        ? "Command line" : "Compilation command");
+    output.add('$message: $c');
+  }
+  return output;
+}
 
-  void testAdded() { _foundTests++; }
 
-  void start(TestCase test) {
-    _printStartProgress(test);
+class EventListener {
+  void testAdded() { }
+  void start(TestCase test) { }
+  void done(TestCase test) { }
+  void allTestsKnown() { }
+  void allDone() { }
+}
+
+class ExitCodeSetter extends EventListener {
+  bool _failingTest = false;
+
+  void done(TestCase test) {
+    _failingTest = _failingTest || test.lastCommandOutput.unexpectedOutput;

[ricow1, 2013/03/12 10:31:47]

can't we just set the exit code here?

[kustermann, 2013/03/12 13:59:16]

Done.

   }
+  void allDone() {
+    if (_failingTest) {
+      io.exitCode = 1;
+    }
+  }
+}
 
+class FlakyLogWriter extends EventListener {
   void done(TestCase test) {
     if (test.isFlaky && test.lastCommandOutput.result != PASS) {
       var buf = new StringBuffer();
@@ -56,171 +152,253 @@ class ProgressIndicator {
       }
       _appendToFlakyFile(buf.toString());
     }
-    for (var commandOutput in test.commandOutputs.values) {
-      if (commandOutput.compilationSkipped)
-        _skippedCompilations++;
+  }
+
+  void _appendToFlakyFile(String msg) {
+    var file = new File(TestUtils.flakyFileName());
+    var fd = file.openSync(FileMode.APPEND);
+    fd.writeStringSync(msg);
+    fd.closeSync();
+  }
+}
+
+class SummaryPrinter extends EventListener {
+  void allTestsKnown() {
+    if (SummaryReport.total > 0) {
+      SummaryReport.printReport();
     }
+  }
+}
+
+class TimingPrinter extends EventListener {
+  List<TestCase> _tests = <TestCase>[];
+  Date _startTime;
+
+  TimingPrinter(this._startTime);

[ricow1, 2013/03/12 10:31:47]

can't we just set this to now?

[kustermann, 2013/03/12 13:59:16]

I don't really care, I just kept it as it was before. Let's keep it for now.

+
+  void done(TestCase testCase) {
+    _tests.add(testCase);
+  }
+
+  void allDone() {
+    // TODO: We should take all the commands into account

[ricow1, 2013/03/12 10:31:47]

Yes, this is probably very misleading for dart2js bots, can we file a bug for
this or alternatively just fix it (I assume that we could just add up the
timings for the commands?) - fix in another cl though

[kustermann, 2013/03/12 13:59:16]

We'll do it in another CL.

+    Duration d = (new Date.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;
+    });
+    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');
+    }
+  }
+}
+
+class StatusFileUpdatePrinter extends EventListener {
+  var statusToConfigs = new Map<String, List<String>>();
+  var _failureSummary = <String>[];
 
+  void done(TestCase test) {
     if (test.lastCommandOutput.unexpectedOutput) {
-      _failedTests++;
       _printFailureOutput(test);
-    } else {
-      _passedTests++;
     }
-    _printDoneProgress(test);
-    // If we need to print timing information we hold on to all completed
-    // tests.
-    if (_printTiming) _tests.add(test);
   }
 
-  void allTestsKnown() {
-    if (!_allTestsKnown) SummaryReport.printReport();
-    _allTestsKnown = true;
+  void allDone() {
+    _printFailureSummary();
   }
 
-  void _printSkippedCompilationInfo() {
-    if (_skippedCompilations > 0) {
-      print('\n$_skippedCompilations compilations were skipped because '
-            'the previous output was already up to date\n');
+
+  void _printFailureOutput(TestCase test) {
+    String status = '${test.displayName}: ${test.lastCommandOutput.result}';
+    List<String> configs =
+        statusToConfigs.putIfAbsent(status, () => <String>[]);
+    configs.add(test.configurationString);
+    if (test.lastCommandOutput.hasTimedOut) {
+      print('\n${test.displayName} timed out on ${test.configurationString}');
     }
   }
 
-  void _printTimingInformation() {
-    if (_printTiming) {
-      // TODO: We should take all the commands into account
-      Duration d = (new Date.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;
+  String _extractRuntime(String configuration) {
+    // Extract runtime from a configuration, for example,
+    // 'none-vm-checked release_ia32'.
+    List<String> runtime = configuration.split(' ')[0].split('-');
+    return '${runtime[0]}-${runtime[1]}';
+  }
+
+  void _printFailureSummary() {
+    var groupedStatuses = new Map<String, List<String>>();
+    statusToConfigs.forEach((String status, List<String> configs) {
+      var runtimeToConfiguration = new Map<String, List<String>>();
+      for (String config in configs) {
+        String runtime = _extractRuntime(config);
+        var runtimeConfigs =
+            runtimeToConfiguration.putIfAbsent(runtime, () => <String>[]);
+        runtimeConfigs.add(config);
+      }
+      runtimeToConfiguration.forEach((String runtime,
+                                      List<String> runtimeConfigs) {
+        runtimeConfigs.sort((a, b) => a.compareTo(b));
+        List<String> statuses =
+            groupedStatuses.putIfAbsent('$runtime: $runtimeConfigs',
+                                        () => <String>[]);
+        statuses.add(status);
       });
-      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');
+    });
+
+    print('\n\nNecessary status file updates:');
+    groupedStatuses.forEach((String config, List<String> statuses) {
+      print('');
+      print('$config:');
+      statuses.sort((a, b) => a.compareTo(b));
+      for (String status in statuses) {
+        print('  $status');
       }
+    });
+  }
+}
+
+class SkippedCompilationsPrinter extends EventListener {
+  int _skippedCompilations = 0;
+
+  void done(TestCase test) {
+    for (var commandOutput in test.commandOutputs.values) {
+      if (commandOutput.compilationSkipped)
+        _skippedCompilations++;
     }
   }
 
   void allDone() {
-    _printFailureSummary();
-    _printStatus();
-    _printSkippedCompilationInfo();
-    _printTimingInformation();
-    stdout.close();
-    stderr.close();
-    if (_failedTests > 0) {
-      io.exitCode = 1;
+    if (_skippedCompilations > 0) {
+      print('\n$_skippedCompilations compilations were skipped because '
+            'the previous output was already up to date\n');
     }
   }
+}
 
-  void _printStartProgress(TestCase test) {}
-  void _printDoneProgress(TestCase test) {}
+class LeftOverTempDirPrinter extends EventListener {
+  final MIN_NUMBER_OF_TEMP_DIRS = 50;
 
-  String _pad(String s, int length) {
-    StringBuffer buffer = new StringBuffer();
-    for (int i = s.length; i < length; i++) {
-      buffer.add(' ');
-    }
-    buffer.add(s);
-    return buffer.toString();
+  Path _tempDir() {
+    // Dir will be located in the system temporary directory.
+    var dir = new Directory('').createTempSync();
+    var path = new Path(dir.path).directoryPath;
+    dir.deleteSync();
+    return path;
   }
 
-  String _padTime(int time) {
-    if (time == 0) {
-      return '00';
-    } else if (time < 10) {
-      return '0$time';
-    } else {
-      return '$time';
+  void allDone() {
+    var tempDirs = [];
+    var systemTempDir = _tempDir();
+    var lister = new Directory.fromPath(systemTempDir).list();
+    lister.onDir = (path) => tempDirs.add(path);
+    lister.onDone = (_) {
+      if (tempDirs.length > MIN_NUMBER_OF_TEMP_DIRS) {
+        DebugLogger.warning("There are more then $MIN_NUMBER_OF_TEMP_DIRS "
+                            "directories in the system tempdir "
+                            "('$systemTempDir')! Maybe left over directories?");
+      }
+    };
+  }
+}
+
+class LineProgressIndicator extends EventListener {
+  void done(TestCase test) {
+    var status = 'pass';
+    if (test.lastCommandOutput.unexpectedOutput) {
+      status = 'fail';
     }
+    print('Done ${test.configurationString} ${test.displayName}: $status');
   }
+}
 
-  String _timeString(Duration d) {
-    var min = d.inMinutes;
-    var sec = d.inSeconds % 60;
-    return '${_padTime(min)}:${_padTime(sec)}';
+class TestFailurePrinter extends EventListener {
+  var _failureSummary = <String>[];
+  var _formatter;
+
+  TestFailurePrinter([this._formatter = const Formatter()]);
+
+  void done(TestCase test) {
+    if (test.lastCommandOutput.unexpectedOutput) {
+      _printFailureOutput(test);
+    }
   }
 
-  String _header(String header) => header;
+  void allDone() {
+    _printFailureSummary();
+  }
 
   void _printFailureOutput(TestCase test) {
-    var failureOutput = _buildFailureOutput(test);
+    var failureOutput = _buildFailureOutput(test, _formatter);
     for (var line in failureOutput) {
       print(line);
     }
+    print('');
     _failureSummary.addAll(failureOutput);
   }
 
-  List<String> _buildFailureOutput(TestCase test) {
-    List<String> output = new List<String>();
-    output.add('');
-    output.add(_header('FAILED: ${test.configurationString}'
-                       ' ${test.displayName}'));
-    StringBuffer expected = new StringBuffer();
-    expected.add('Expected: ');
-    for (var expectation in test.expectedOutcomes) {
-      expected.add('$expectation ');
-    }
-    output.add(expected.toString());
-    output.add('Actual: ${test.lastCommandOutput.result}');
-    if (!test.lastCommandOutput.hasTimedOut && test.info != null) {
-      if (test.lastCommandOutput.incomplete && !test.info.hasCompileError) {
-        output.add('Unexpected compile-time error.');
-      } else {
-        if (test.info.hasCompileError) {
-          output.add('Compile-time error expected.');
-        }
-        if (test.info.hasRuntimeError) {
-          output.add('Runtime error expected.');
-        }
-      }
-    }
-    if (!test.lastCommandOutput.diagnostics.isEmpty) {
-      String prefix = 'diagnostics:';
-      for (var s in test.lastCommandOutput.diagnostics) {
-        output.add('$prefix ${s}');
-        prefix = '   ';
-      }
-    }
-    if (!test.lastCommandOutput.stdout.isEmpty) {
-      output.add('');
-      output.add('stdout:');
-      if (test.lastCommandOutput.command.isPixelTest) {
-        output.add('DRT pixel test failed! stdout is not printed because it '
-                   'contains binary data!');
-      } else {
-        output.add(decodeUtf8(test.lastCommandOutput.stdout));
-      }
-    }
-    if (!test.lastCommandOutput.stderr.isEmpty) {
-      output.add('');
-      output.add('stderr:');
-      output.add(decodeUtf8(test.lastCommandOutput.stderr));
-    }
-    if (test is BrowserTestCase) {
-      // Additional command for rerunning the steps locally after the fact.
-      var command =
-        test.configuration["_servers_"].httpServerCommandline();
-      output.add('To retest, run:  $command');
-    }
-    for (Command c in test.commands) {
-      output.add('');
-      String message = (c == test.commands.last
-          ? "Command line" : "Compilation command");
-      output.add('$message: $c');
-    }
-    return output;
-  }
-
   void _printFailureSummary() {
     for (String line in _failureSummary) {
       print(line);
     }
     print('');
   }
+}
+
+class ProgressIndicator extends EventListener {
+  ProgressIndicator(this._startTime);
+
+  factory ProgressIndicator.fromName(String name,
+                                     Date startTime,
+                                     Formatter formatter) {
+    switch (name) {
+      case 'compact':
+        return new CompactProgressIndicator(startTime, formatter);
+      case 'line':
+        return new LineProgressIndicator();
+      case 'verbose':
+        return new VerboseProgressIndicator(startTime);
+      case 'status':
+        return new ProgressIndicator(startTime);
+      case 'buildbot':
+        return new BuildbotProgressIndicator(startTime);
+      default:
+        assert(false);
+        break;
+    }
+  }
+
+  void testAdded() { _foundTests++; }
+
+  void start(TestCase test) {
+    _printStartProgress(test);
+  }
+
+  void done(TestCase test) {
+    if (test.lastCommandOutput.unexpectedOutput) {
+      _failedTests++;
+    } else {
+      _passedTests++;
+    }
+    _printDoneProgress(test);
+  }
+
+  void allTestsKnown() {
+    _allTestsKnown = true;
+  }
+
+  void allDone() {
+    _printStatus();
+    stdout.close();
+    stderr.close();
+  }
+
+  void _printStartProgress(TestCase test) {}
+  void _printDoneProgress(TestCase test) {}
 
   void _printStatus() {
     if (_failedTests == 0) {
@@ -235,13 +413,6 @@ class ProgressIndicator {
     }
   }
 
-  void _appendToFlakyFile(String msg) {
-    var file = new File(TestUtils.flakyFileName());
-    var fd = file.openSync(FileMode.APPEND);
-    fd.writeStringSync(msg);
-    fd.closeSync();
-  }
-
   int get numFailedTests => _failedTests;
 
   int _completedTests() => _passedTests + _failedTests;
@@ -249,36 +420,16 @@ class ProgressIndicator {
   int _foundTests = 0;
   int _passedTests = 0;
   int _failedTests = 0;
-  int _skippedCompilations = 0;
   bool _allTestsKnown = false;
   Date _startTime;
-  bool _printTiming;
-  List<TestCase> _tests;
-  List<String> _failureSummary;
-}
-
-
-class SilentProgressIndicator extends ProgressIndicator {
-  SilentProgressIndicator(Date startTime, bool printTiming)
-      : super(startTime, printTiming);
-  void testAdded() { }
-  void start(TestCase test) { }
-  void done(TestCase test) { }
-  void _printStartProgress(TestCase test) { }
-  void _printDoneProgress(TestCase test) { }
-  void allTestsKnown() { }
-  void allDone() { }
 }
 
 abstract class CompactIndicator extends ProgressIndicator {
-  CompactIndicator(Date startTime, bool printTiming)
-      : super(startTime, printTiming);
+  CompactIndicator(Date startTime)
+      : super(startTime);
 
   void allDone() {
     stdout.write('\n'.charCodes);
-    _printFailureSummary();
-    _printSkippedCompilationInfo();
-    _printTimingInformation();
     if (_failedTests > 0) {
       // We may have printed many failure logs, so reprint the summary data.
       _printProgress();
@@ -286,19 +437,6 @@ abstract class CompactIndicator extends ProgressIndicator {
     }
     stdout.close();
     stderr.close();
-    if (_failedTests > 0) {
-      io.exitCode = 1;
-    }
-  }
-
-  void allTestsKnown() {
-    if (!_allTestsKnown && SummaryReport.total > 0) {
-      // Clear progress indicator before printing summary report.
-      stdout.write(
-          '\r                                               \r'.charCodes);
-      SummaryReport.printReport();
-    }
-    _allTestsKnown = true;
   }
 
   void _printStartProgress(TestCase test) => _printProgress();
@@ -309,8 +447,10 @@ abstract class CompactIndicator extends ProgressIndicator {
 
 
 class CompactProgressIndicator extends CompactIndicator {
-  CompactProgressIndicator(Date startTime, bool printTiming)
-      : super(startTime, printTiming);
+  Formatter _formatter;
+
+  CompactProgressIndicator(Date startTime, this._formatter)
+      : super(startTime);
 
   void _printProgress() {
     var percent = ((_completedTests() / _foundTests) * 100).toInt().toString();
@@ -320,73 +460,16 @@ class CompactProgressIndicator extends CompactIndicator {
     Duration d = (new Date.now()).difference(_startTime);
     var progressLine =
         '\r[${_timeString(d)} | $progressPadded% | '
-        '+$passedPadded | -$failedPadded]';
+        '+${_formatter.passed(passedPadded)} | '
+        '-${_formatter.failed(failedPadded)}]';
     stdout.write(progressLine.charCodes);
   }
 }
 
 
-class ColorProgressIndicator extends CompactIndicator {
-  ColorProgressIndicator(Date startTime, bool printTiming)
-      : super(startTime, printTiming);
-
-  static int BOLD = 1;
-  static int GREEN = 32;
-  static int RED = 31;
-  static int NONE = 0;
-
-  addColorWrapped(List<int> codes, String string, int color) {
-    codes.add(27);
-    codes.addAll('[${color}m'.charCodes);
-    codes.addAll(encodeUtf8(string));
-    codes.add(27);
-    codes.addAll('[0m'.charCodes);
-  }
-
-  void _printProgress() {
-    var percent = ((_completedTests() / _foundTests) * 100).toInt().toString();
-    var progressPadded = _pad(_allTestsKnown ? percent : '--', 3);
-    var passedPadded = _pad(_passedTests.toString(), 5);
-    var failedPadded = _pad(_failedTests.toString(), 5);
-    Duration d = (new Date.now()).difference(_startTime);
-    var progressLine = [];
-    progressLine.addAll('\r[${_timeString(d)} | $progressPadded% | '.charCodes);
-    addColorWrapped(progressLine, '+$passedPadded ', GREEN);
-    progressLine.addAll('| '.charCodes);
-    var failedColor = (_failedTests != 0) ? RED : NONE;
-    addColorWrapped(progressLine, '-$failedPadded', failedColor);
-    progressLine.addAll(']'.charCodes);
-    stdout.write(progressLine);
-  }
-
-  String _header(String header) {
-    var result = [];
-    addColorWrapped(result, header, BOLD);
-    return decodeUtf8(result);
-  }
-}
-
-
-class LineProgressIndicator extends ProgressIndicator {
-  LineProgressIndicator(Date startTime, bool printTiming)
-      : super(startTime, printTiming);
-
-  void _printStartProgress(TestCase test) {
-  }
-
-  void _printDoneProgress(TestCase test) {
-    var status = 'pass';
-    if (test.lastCommandOutput.unexpectedOutput) {
-      status = 'fail';
-    }
-    print('Done ${test.configurationString} ${test.displayName}: $status');
-  }
-}
-
-
 class VerboseProgressIndicator extends ProgressIndicator {
-  VerboseProgressIndicator(Date startTime, bool printTiming)
-      : super(startTime, printTiming);
+  VerboseProgressIndicator(Date startTime)
+      : super(startTime);
 
   void _printStartProgress(TestCase test) {
     print('Starting ${test.configurationString} ${test.displayName}...');
@@ -402,26 +485,12 @@ class VerboseProgressIndicator extends ProgressIndicator {
 }
 
 
-class StatusProgressIndicator extends ProgressIndicator {
-  StatusProgressIndicator(Date startTime, bool printTiming)
-      : super(startTime, printTiming);
-
-  void _printStartProgress(TestCase test) {
-  }
-
-  void _printDoneProgress(TestCase test) {
-  }
-}
-
-
 class BuildbotProgressIndicator extends ProgressIndicator {
   static String stepName;
 
-  BuildbotProgressIndicator(Date startTime, bool printTiming)
-      : super(startTime, printTiming);
+  BuildbotProgressIndicator(Date startTime) : super(startTime);
 
-  void _printStartProgress(TestCase test) {
-  }
+  void _printStartProgress(TestCase test) { }

[ricow1, 2013/03/12 10:31:47]

we don't need this

[kustermann, 2013/03/12 13:59:16]

Done.

 
   void _printDoneProgress(TestCase test) {
     var status = 'pass';
@@ -434,67 +503,11 @@ class BuildbotProgressIndicator extends ProgressIndicator {
     print('@@@STEP_TEXT@ $percent% +$_passedTests -$_failedTests @@@');
   }
 
-  void _printFailureSummary() {
-    if (!_failureSummary.isEmpty && stepName != null) {
+  void allDone() {
+    if (_failedTests > 0) {
       print('@@@STEP_FAILURE@@@');
       print('@@@BUILD_STEP $stepName failures@@@');
     }
-    super._printFailureSummary();
   }
 }
 
-class DiffProgressIndicator extends ColorProgressIndicator {
-  Map<String, List<String>> statusToConfigs = new Map<String, List<String>>();
-
-  DiffProgressIndicator(Date startTime, bool printTiming)
-      : super(startTime, printTiming);
-
-  void _printFailureOutput(TestCase test) {
-    String status = '${test.displayName}: ${test.lastCommandOutput.result}';
-    List<String> configs =
-        statusToConfigs.putIfAbsent(status, () => <String>[]);
-    configs.add(test.configurationString);
-    if (test.lastCommandOutput.hasTimedOut) {
-      print('\n${test.displayName} timed out on ${test.configurationString}');
-    }
-  }
-
-  String _extractRuntime(String configuration) {
-    // Extract runtime from a configuration, for example,
-    // 'none-vm-checked release_ia32'.
-    List<String> runtime = configuration.split(' ')[0].split('-');
-    return '${runtime[0]}-${runtime[1]}';
-  }
-
-  void _printFailureSummary() {
-    Map<String, List<String>> groupedStatuses = new Map<String, List<String>>();
-    statusToConfigs.forEach((String status, List<String> configs) {
-      Map<String, List<String>> runtimeToConfiguration =
-          new Map<String, List<String>>();
-      for (String config in configs) {
-        String runtime = _extractRuntime(config);
-        List<String> runtimeConfigs =
-            runtimeToConfiguration.putIfAbsent(runtime, () => <String>[]);
-        runtimeConfigs.add(config);
-      }
-      runtimeToConfiguration.forEach((String runtime,
-                                      List<String> runtimeConfigs) {
-        runtimeConfigs.sort((a, b) => a.compareTo(b));
-        List<String> statuses =
-            groupedStatuses.putIfAbsent('$runtime: $runtimeConfigs',
-                                        () => <String>[]);
-        statuses.add(status);
-      });
-    });
-    groupedStatuses.forEach((String config, List<String> statuses) {
-      print('');
-      print('');
-      print('$config:');
-      statuses.sort((a, b) => a.compareTo(b));
-      for (String status in statuses) {
-        print('  $status');
-      }
-    });
-    _printStatus();
-  }
-}