Revert of commit 14947

tools/testing/dart/test_progress.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.
 
 #library("test_progress");
 
 #import("dart:io");
 #import("test_runner.dart");
 #import("test_suite.dart");
 #import("status_file_parser.dart");
@@ skipping 28 matching lines @@
     }
   }
 
   void testAdded() { _foundTests++; }
 
   void start(TestCase test) {
     _printStartProgress(test);
   }
 
   void done(TestCase test) {
-    if (test.isFlaky && test.lastCommandOutput.result != PASS) {
+    if (test.isFlaky && test.output.result != PASS) {
       var buf = new StringBuffer();
       for (var l in _buildFailureOutput(test)) {
         buf.add("$l\n");
       }
       _appendToFlakyFile(buf.toString());
     }
 
-    if (test.lastCommandOutput.unexpectedOutput) {
+    if (test.output.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 _printTimingInformation() {
     if (_printTiming) {
       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;
+        Duration aDuration = a.output.time;
+        Duration bDuration = b.output.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 duration = _tests[i].output.time;
         var configuration = _tests[i].configurationString;
         print('${duration} - $configuration $name');
       }
     }
   }
 
   void allDone() {
     _printFailureSummary();
     _printStatus();
     _printTimingInformation();
@@ skipping 44 matching lines @@
     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('Actual: ${test.output.result}');
+    if (!test.output.hasTimedOut && test.info != null) {
+      if (test.output.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) {
+    if (!test.output.diagnostics.isEmpty) {
       String prefix = 'diagnostics:';
-      for (var s in test.lastCommandOutput.diagnostics) {
+      for (var s in test.output.diagnostics) {
         output.add('$prefix ${s}');
         prefix = '   ';
       }
     }
-    if (!test.lastCommandOutput.stdout.isEmpty) {
+    if (!test.output.stdout.isEmpty) {
       output.add('');
       output.add('stdout:');
-      for (var s in test.lastCommandOutput.stdout) {
+      for (var s in test.output.stdout) {
         output.add(s);
       }
     }
-    if (!test.lastCommandOutput.stderr.isEmpty) {
+    if (!test.output.stderr.isEmpty) {
       output.add('');
       output.add('stderr:');
-      for (var s in test.lastCommandOutput.stderr) {
+      for (var s in test.output.stderr) {
         output.add(s);
       }
     }
     for (Command c in test.commands) {
       output.add('');
       String message = (c == test.commands.last
           ? "Command line" : "Compilation command");
       output.add('$message: ${c.commandLine}');
     }
     return output;
@@ skipping 149 matching lines @@
 
 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) {
+    if (test.output.unexpectedOutput) {
       status = 'fail';
     }
     print('Done ${test.configurationString} ${test.displayName}: $status');
   }
 }
 
 
 class VerboseProgressIndicator extends ProgressIndicator {
   VerboseProgressIndicator(Date startTime, bool printTiming)
       : super(startTime, printTiming);
 
   void _printStartProgress(TestCase test) {
     print('Starting ${test.configurationString} ${test.displayName}...');
   }
 
   void _printDoneProgress(TestCase test) {
     var status = 'pass';
-    if (test.lastCommandOutput.unexpectedOutput) {
+    if (test.output.unexpectedOutput) {
       status = 'fail';
     }
     print('Done ${test.configurationString} ${test.displayName}: $status');
   }
 }
 
 
 class StatusProgressIndicator extends ProgressIndicator {
   StatusProgressIndicator(Date startTime, bool printTiming)
       : super(startTime, printTiming);
@@ skipping 10 matching lines @@
   static String stepName;
 
   BuildbotProgressIndicator(Date startTime, bool printTiming)
       : super(startTime, printTiming);
 
   void _printStartProgress(TestCase test) {
   }
 
   void _printDoneProgress(TestCase test) {
     var status = 'pass';
-    if (test.lastCommandOutput.unexpectedOutput) {
+    if (test.output.unexpectedOutput) {
       status = 'fail';
     }
     var percent = ((_completedTests() / _foundTests) * 100).toInt().toString();
     print('Done ${test.configurationString} ${test.displayName}: $status');
     print('@@@STEP_CLEAR@@@');
     print('@@@STEP_TEXT@ $percent% +$_passedTests -$_failedTests @@@');
   }
 
   void _printFailureSummary() {
     if (!_failureSummary.isEmpty) {
       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}';
+    String status = '${test.displayName}: ${test.output.result}';
     List<String> configs =
         statusToConfigs.putIfAbsent(status, () => <String>[]);
     configs.add(test.configurationString);
-    if (test.lastCommandOutput.hasTimedOut) {
+    if (test.output.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]}';
   }
@@ skipping 23 matching lines @@
       print('');
       print('$config:');
       statuses.sort((a, b) => a.compareTo(b));
       for (String status in statuses) {
         print('  $status');
       }
     });
     _printStatus();
   }
 }