Index: tools/testing/dart/http_server.dart |
diff --git a/tools/testing/dart/http_server.dart b/tools/testing/dart/http_server.dart |
index cfc70edfc61f00b898f697ac3a15b2a41e97edb8..53538fd579f8e42f73682e576e71dd56d1379bb1 100644 |
--- a/tools/testing/dart/http_server.dart |
+++ b/tools/testing/dart/http_server.dart |
@@ -2,16 +2,17 @@ |
// for details. All rights reserved. Use of this source code is governed by a |
// BSD-style license that can be found in the LICENSE file. |
+library http_server; |
+ |
import 'dart:async'; |
-import 'dart:convert' show HtmlEscape; |
import 'dart:io'; |
-import 'package:package_resolver/package_resolver.dart'; |
+import 'dart:convert' show HtmlEscape; |
-import 'configuration.dart'; |
-import 'test_suite.dart'; |
+import 'test_suite.dart'; // For TestUtils. |
import 'vendored_pkg/args/args.dart'; |
import 'utils.dart'; |
+import 'package:package_resolver/package_resolver.dart'; |
class DispatchingServer { |
HttpServer server; |
@@ -93,7 +94,7 @@ void main(List<String> arguments) { |
var servers = new TestingServers( |
args['build-directory'] as String, |
args['csp'] as bool, |
- Runtime.find(args['runtime'] as String), |
+ args['runtime'] as String, |
null, |
args['package-root'] as String, |
args['packages'] as String); |
@@ -131,12 +132,12 @@ class TestingServers { |
Uri _packageRoot; |
Uri _packages; |
final bool useContentSecurityPolicy; |
- final Runtime runtime; |
+ final String runtime; |
DispatchingServer _server; |
SyncPackageResolver _resolver; |
TestingServers(String buildDirectory, this.useContentSecurityPolicy, |
- [this.runtime = Runtime.none, |
+ [String this.runtime = 'none', |
String dartDirectory, |
String packageRoot, |
String packages]) { |
@@ -193,7 +194,7 @@ class TestingServers { |
'-c', |
crossOriginPort, |
'--build-directory=$buildDirectory', |
- '--runtime=${runtime.name}' |
+ '--runtime=$runtime' |
]; |
if (useContentSecurityPolicy) { |
command.add('--csp'); |