Print output of all commands if a testcase failed

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 72 matching lines @@
       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 = '   ';
+  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]:");

[kustermann, 2013/05/30 13:03:34]

Do we want to print this always or just if there was actually output?

[ricow1, 2013/05/30 13:14:10]

Always

+      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:');
+        if (command.isPixelTest) {
+          output.add('DRT pixel test failed! stdout is not printed because it '
+                     'contains binary data!');
+        } else {
+          output.addAll(getLinesWithoutCarriageReturn(commandOutput.stdout));
+        }
+      }
+      if (!commandOutput.stderr.isEmpty) {
+        output.add('');
+        output.add('stderr:');
+        output.addAll(getLinesWithoutCarriageReturn(commandOutput.stderr));
+      }
     }
   }
-  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.addAll(
-          getLinesWithoutCarriageReturn(test.lastCommandOutput.stdout));
-    }
-  }
-  if (!test.lastCommandOutput.stderr.isEmpty) {
-    output.add('');
-    output.add('stderr:');
-    output.addAll(getLinesWithoutCarriageReturn(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('');
     output.add('To retest, run:  $command');
   }
-  for (Command c in test.commands) {
+  for (var i = 0; i < test.commands.length; i++) {
+    var command = test.commands[i];
     output.add('');
-    String message = (c == test.commands.last
-        ? "Command line" : "Compilation command");
-    output.add('$message: $c');
+    output.add('Command[$i]: $command');
   }
   return output;
 }
 
 String _buildSummaryEnd(int failedTests) {
     if (failedTests == 0) {
       return '\n===\n=== All tests succeeded\n===\n';
     } else {
       var pluralSuffix = failedTests != 1 ? 's' : '';
       return '\n===\n=== ${failedTests} test$pluralSuffix failed\n===\n';
@@ skipping 377 matching lines @@
         print('@@@BUILD_STEP $stepName failures@@@');
       }
       for (String line in _failureSummary) {
         print(line);
       }
       print('');
     }
     print(_buildSummaryEnd(_failedTests));
   }
 }