OLD | NEW |
1 // Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2017, 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 import 'dart:async'; | 5 import 'dart:async'; |
6 import 'dart:convert'; | 6 import 'dart:convert'; |
7 import 'dart:io'; | 7 import 'dart:io'; |
8 | 8 |
9 import 'compiler_configuration.dart'; | 9 import 'compiler_configuration.dart'; |
10 import 'http_server.dart'; | 10 import 'http_server.dart'; |
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
363 | 363 |
364 return isValid; | 364 return isValid; |
365 } | 365 } |
366 | 366 |
367 /// Starts global HTTP servers that serve the entire dart repo. | 367 /// Starts global HTTP servers that serve the entire dart repo. |
368 /// | 368 /// |
369 /// The HTTP server is available on `window.location.port`, and a second | 369 /// The HTTP server is available on `window.location.port`, and a second |
370 /// server for cross-domain tests can be found by calling | 370 /// server for cross-domain tests can be found by calling |
371 /// `getCrossOriginPortNumber()`. | 371 /// `getCrossOriginPortNumber()`. |
372 Future startServers() { | 372 Future startServers() { |
373 _servers = new TestingServers(buildDirectory, isCsp, runtime, null); | 373 _servers = new TestingServers( |
| 374 buildDirectory, isCsp, runtime, null, packageRoot, packages); |
374 var future = servers.startServers(localIP, | 375 var future = servers.startServers(localIP, |
375 port: testServerPort, crossOriginPort: testServerCrossOriginPort); | 376 port: testServerPort, crossOriginPort: testServerCrossOriginPort); |
376 | 377 |
377 if (isVerbose) { | 378 if (isVerbose) { |
378 future = future.then((_) { | 379 future = future.then((_) { |
379 print('Started HttpServers: ${servers.httpServerCommandLine()}'); | 380 print('Started HttpServers: ${servers.httpServerCommandLine()}'); |
380 }); | 381 }); |
381 } | 382 } |
382 | 383 |
383 return future; | 384 return future; |
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
731 | 732 |
732 case macos: | 733 case macos: |
733 return 'xcodebuild/'; | 734 return 'xcodebuild/'; |
734 } | 735 } |
735 | 736 |
736 throw "unreachable"; | 737 throw "unreachable"; |
737 } | 738 } |
738 | 739 |
739 String toString() => "System($name)"; | 740 String toString() => "System($name)"; |
740 } | 741 } |
OLD | NEW |