| OLD | NEW |
| 1 // Copyright (c) 2011, 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_runner"); | 5 #library("test_runner"); |
| 6 | 6 |
| 7 #import("dart:io"); | 7 #import("dart:io"); |
| 8 #import("status_file_parser.dart"); | 8 #import("status_file_parser.dart"); |
| 9 #import("test_progress.dart"); | 9 #import("test_progress.dart"); |
| 10 #import("test_suite.dart"); | 10 #import("test_suite.dart"); |
| 11 | 11 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 var suffixSplit = suffix.split(' '); | 70 var suffixSplit = suffix.split(' '); |
| 71 suffixSplit.forEach((e) { | 71 suffixSplit.forEach((e) { |
| 72 if (!e.isEmpty()) newArguments.add(e); | 72 if (!e.isEmpty()) newArguments.add(e); |
| 73 }); | 73 }); |
| 74 arguments = newArguments; | 74 arguments = newArguments; |
| 75 } | 75 } |
| 76 } | 76 } |
| 77 | 77 |
| 78 int get timeout() => configuration['timeout']; | 78 int get timeout() => configuration['timeout']; |
| 79 | 79 |
| 80 String get configurationString() => | 80 String get configurationString() { |
| 81 "${configuration['mode']}_${configuration['arch']}"; | 81 final component = configuration['component']; |
| 82 final mode = configuration['mode']; |
| 83 final arch = configuration['arch']; |
| 84 return "$component ${mode}_$arch"; |
| 85 } |
| 82 | 86 |
| 83 void completed() { completedHandler(this); } | 87 void completed() { completedHandler(this); } |
| 84 } | 88 } |
| 85 | 89 |
| 86 | 90 |
| 87 /** | 91 /** |
| 88 * BrowserTestCase has an extra compilation command that is run by | 92 * BrowserTestCase has an extra compilation command that is run by |
| 89 * RunningProcess.start(), and it checks conditions on the test output | 93 * RunningProcess.start(), and it checks conditions on the test output |
| 90 * in TestOutput.didFail(). | 94 * in TestOutput.didFail(). |
| 91 */ | 95 */ |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 550 test.displayName != 'dartc/junit_tests') { | 554 test.displayName != 'dartc/junit_tests') { |
| 551 _ensureDartcBatchRunnersStarted(test.executablePath); | 555 _ensureDartcBatchRunnersStarted(test.executablePath); |
| 552 _getDartcBatchRunnerProcess().startTest(test); | 556 _getDartcBatchRunnerProcess().startTest(test); |
| 553 } else { | 557 } else { |
| 554 new RunningProcess(test).start(); | 558 new RunningProcess(test).start(); |
| 555 } | 559 } |
| 556 _numProcesses++; | 560 _numProcesses++; |
| 557 } | 561 } |
| 558 } | 562 } |
| 559 } | 563 } |
| OLD | NEW |