| Index: tools/test.dart
|
| diff --git a/tools/test.dart b/tools/test.dart
|
| index f7115aab2237ad69b5b48442a0b0cec76284c29e..869d879fb684e09e851a092cc7c2a60e8237fbd5 100755
|
| --- a/tools/test.dart
|
| +++ b/tools/test.dart
|
| @@ -127,18 +127,32 @@ main() {
|
| // Start global http server that serves the entire dart repo.
|
| // The http server is available on localhost:9876 for any
|
| // test that needs to load resources from the repo over http.
|
| - if (!listTests) startHttpServer('127.0.0.1', 9876);
|
| -
|
| - // Start process queue.
|
| - new ProcessQueue(
|
| - maxProcesses,
|
| - progressIndicator,
|
| - startTime,
|
| - printTiming,
|
| - enqueueConfiguration,
|
| - () {
|
| - if (!listTests) terminateHttpServer();
|
| - },
|
| - verbose,
|
| - listTests);
|
| + //
|
| + // TODO(ager): Simplify when mac os startHttpServer issues has
|
| + // been resolved.
|
| + if (!listTests) {
|
| + startHttpServer('127.0.0.1', 9876).then((_) {
|
| + // Start process queue.
|
| + new ProcessQueue(maxProcesses,
|
| + progressIndicator,
|
| + startTime,
|
| + printTiming,
|
| + enqueueConfiguration,
|
| + () {
|
| + if (!listTests) terminateHttpServer();
|
| + },
|
| + verbose,
|
| + listTests);
|
| + });
|
| + } else {
|
| + // Start process queue.
|
| + new ProcessQueue(maxProcesses,
|
| + progressIndicator,
|
| + startTime,
|
| + printTiming,
|
| + enqueueConfiguration,
|
| + () => null,
|
| + verbose,
|
| + listTests);
|
| + }
|
| }
|
|
|