| Index: tools/testing/dart/test_runner.dart
|
| diff --git a/tools/testing/dart/test_runner.dart b/tools/testing/dart/test_runner.dart
|
| index 3c454ad2fd87e1e2cac9668532be180c2515ddcc..fcc9f8507762e14a217572e4fe5a7c25d6eb147a 100644
|
| --- a/tools/testing/dart/test_runner.dart
|
| +++ b/tools/testing/dart/test_runner.dart
|
| @@ -30,8 +30,6 @@ const int SLOW_TIMEOUT_MULTIPLIER = 4;
|
|
|
| const int CRASHING_BROWSER_EXITCODE = -10;
|
|
|
| -const int NUMBER_OF_BROWSERCONTROLLER_BROWSERS = 4;
|
| -
|
| typedef void TestCaseEvent(TestCase testCase);
|
| typedef void ExitCodeEvent(int exitCode);
|
| typedef void EnqueueMoreWork(ProcessQueue queue);
|
| @@ -1101,7 +1099,6 @@ class BatchRunnerProcess {
|
| String _status;
|
| DateTime _startTime;
|
| Timer _timer;
|
| -
|
| bool _isWebDriver;
|
|
|
| BatchRunnerProcess(TestCase testCase) {
|
| @@ -1246,9 +1243,7 @@ class BatchRunnerProcess {
|
| } else if (line.startsWith('>>> BATCH')) {
|
| // ignore
|
| } else if (line.startsWith('>>> ')) {
|
| - throw new Exception(
|
| - 'Unexpected command from ${testCase.configuration['compiler']} '
|
| - 'batch runner.');
|
| + throw new Exception("Unexpected command from batch runner: '$line'.");
|
| } else {
|
| _testStdout.addAll(encodeUtf8(line));
|
| _testStdout.addAll("\n".codeUnits);
|
| @@ -1583,17 +1578,19 @@ class ProcessQueue {
|
| }
|
|
|
| Future<BrowserTestRunner> _getBrowserTestRunner(TestCase test) {
|
| + var local_ip = test.configuration['local_ip'];
|
| var runtime = test.configuration['runtime'];
|
| + var num_browsers = test.configuration['tasks'];
|
| if (_browserTestRunners[runtime] == null) {
|
| var testRunner =
|
| - new BrowserTestRunner(runtime, NUMBER_OF_BROWSERCONTROLLER_BROWSERS);
|
| + new BrowserTestRunner(local_ip, runtime, num_browsers);
|
| _browserTestRunners[runtime] = testRunner;
|
| return testRunner.start().then((started) {
|
| if (started) {
|
| return testRunner;
|
| }
|
| print("Issue starting browser test runner");
|
| - exit(1);
|
| + io.exit(1);
|
| });
|
| }
|
| return new Future.immediate(_browserTestRunners[runtime]);
|
| @@ -1701,7 +1698,6 @@ class ProcessQueue {
|
| _tryRunTest();
|
| };
|
| test.completedHandler = testCompleted;
|
| -
|
| if (test.usesBrowserController) {
|
| _startBrowserControllerTest(test);
|
| } else {
|
|
|