| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library test_progress; | 5 library test_progress; |
| 6 | 6 |
| 7 import "dart:io"; | 7 import "dart:io"; |
| 8 import "dart:io" as io; | 8 import "dart:io" as io; |
| 9 import "http_server.dart" as http_server; | 9 import "http_server.dart" as http_server; |
| 10 import "status_file_parser.dart"; | 10 import "status_file_parser.dart"; |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 output.add(decodeUtf8(test.lastCommandOutput.stdout)); | 195 output.add(decodeUtf8(test.lastCommandOutput.stdout)); |
| 196 } | 196 } |
| 197 } | 197 } |
| 198 if (!test.lastCommandOutput.stderr.isEmpty) { | 198 if (!test.lastCommandOutput.stderr.isEmpty) { |
| 199 output.add(''); | 199 output.add(''); |
| 200 output.add('stderr:'); | 200 output.add('stderr:'); |
| 201 output.add(decodeUtf8(test.lastCommandOutput.stderr)); | 201 output.add(decodeUtf8(test.lastCommandOutput.stderr)); |
| 202 } | 202 } |
| 203 if (test is BrowserTestCase) { | 203 if (test is BrowserTestCase) { |
| 204 // Additional command for rerunning the steps locally after the fact. | 204 // Additional command for rerunning the steps locally after the fact. |
| 205 output.add('To retest, run: ' | 205 var command = |
| 206 '${TestUtils.dartTestExecutable.toNativePath()} ' | 206 test.configuration["_servers_"].httpServerCommandline(); |
| 207 '${TestUtils.dartDir().toNativePath()}/tools/testing/dart/' | 207 output.add('To retest, run: $command'); |
| 208 'http_server.dart -m ${test.configuration["mode"]} ' | |
| 209 '-a ${test.configuration["arch"]} ' | |
| 210 '-p ${http_server.TestingServerRunner.serverList[0].port} ' | |
| 211 '-c ${http_server.TestingServerRunner.serverList[1].port} ' | |
| 212 '--package-root=${http_server.TestingServerRunner.packageRootDir}'); | |
| 213 } | 208 } |
| 214 for (Command c in test.commands) { | 209 for (Command c in test.commands) { |
| 215 output.add(''); | 210 output.add(''); |
| 216 String message = (c == test.commands.last | 211 String message = (c == test.commands.last |
| 217 ? "Command line" : "Compilation command"); | 212 ? "Command line" : "Compilation command"); |
| 218 output.add('$message: ${c.commandLine}'); | 213 output.add('$message: ${c.commandLine}'); |
| 219 } | 214 } |
| 220 return output; | 215 return output; |
| 221 } | 216 } |
| 222 | 217 |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 496 print(''); | 491 print(''); |
| 497 print('$config:'); | 492 print('$config:'); |
| 498 statuses.sort((a, b) => a.compareTo(b)); | 493 statuses.sort((a, b) => a.compareTo(b)); |
| 499 for (String status in statuses) { | 494 for (String status in statuses) { |
| 500 print(' $status'); | 495 print(' $status'); |
| 501 } | 496 } |
| 502 }); | 497 }); |
| 503 _printStatus(); | 498 _printStatus(); |
| 504 } | 499 } |
| 505 } | 500 } |
| OLD | NEW |