Remove \r in command stdout/stderr when building failure a failure output.

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 43 matching lines @@
   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> getLinesWithoutCarriageReturn(List<int> output) {
+    return decodeUtf8(output).replaceAll('\r\n', '\n')
+        .replaceAll('\r', '\n').split('\n');
+  }
+
   List<String> output = new List<String>();
   output.add('');
   output.add(formatter.failed('FAILED: ${test.configurationString}'
                               ' ${test.displayName}'));
   StringBuffer expected = new StringBuffer();
   expected.write('Expected: ');
   for (var expectation in test.expectedOutcomes) {
     expected.write('$expectation ');
   }
   output.add(expected.toString());
@@ skipping 17 matching lines @@
       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));
+      output.addAll(
+          getLinesWithoutCarriageReturn(test.lastCommandOutput.stdout));
     }
   }
   if (!test.lastCommandOutput.stderr.isEmpty) {
     output.add('');
     output.add('stderr:');
-    output.add(decodeUtf8(test.lastCommandOutput.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('To retest, run:  $command');
   }
   for (Command c in test.commands) {
     output.add('');
     String message = (c == test.commands.last
@@ skipping 392 matching lines @@
         print('@@@BUILD_STEP $stepName failures@@@');
       }
       for (String line in _failureSummary) {
         print(line);
       }
       print('');
     }
     super.allDone();
   }
 }