Unbreak local browser testing.

tools/testing/dart/http_server.dart

Index: tools/testing/dart/http_server.dart
diff --git a/tools/testing/dart/http_server.dart b/tools/testing/dart/http_server.dart
index db2d04642c28395ccf0eaf0b6eba7ebd8aae325e..56aa98374e023b53b270645f4ebdf79da4b86cb3 100644
--- a/tools/testing/dart/http_server.dart
+++ b/tools/testing/dart/http_server.dart
@@ -7,7 +7,50 @@ library http_server;
 import 'dart:io';
 import 'dart:isolate';
 import 'test_suite.dart';  // For TestUtils.
+import 'temp_package_root/args/args.dart';

[Jennifer Messerly, 2013/01/16 20:03:44]

Shouldn't be done in this change, but I wanted to ask:

Can we rename this to directory "vendored_pkg" or something similar?

Also, can we add a README explaining why we have a copy of these packages?

Finally, if it is a problem to depend on something outside of "tools/testing",
how can we get the tests/build bots set up to catch that problem if it is
introduced again in the future?

[ahe, 2013/01/16 20:49:54]

Perhaps we could just rewrite this program to take a fixed number of arguments.
It would simplify updating tools/testing/bin/OS/dart to not also have to update
a copy of pkg.
I stated in a different conversation that it would be hard to test. But that's
because my natural reaction is to use something like dart2js to find all the
imports. But this could get broken as soon as dart2js got out of sync with
tools/testing/bin/OS/dart.

However, a simple test that just uses dart:io to scan the dart files in
tools/testing/dart would work.

 
+main() {
+  /** Convenience method for local testing. */
+  var parser = new ArgParser();
+  parser.addOption('port', abbr: 'p',
+      help: 'The main server port we wish to respond to requests.',
+      defaultsTo: '0');
+  parser.addOption('crossOriginPort', abbr: 'c',
+      help: 'A different port that accepts request from the main server port.',
+      defaultsTo: '0');
+  parser.addOption('mode', abbr: 'm', help: 'Testing mode.',
+      defaultsTo: 'release');
+  parser.addOption('arch', abbr: 'a', help: 'Testing architecture.',
+      defaultsTo: 'ia32');
+  parser.addFlag('help', abbr: 'h', negatable: false,
+      help: 'Print this usage information.');
+  var args = parser.parse(new Options().arguments);
+  if (args['help']) {
+    print(parser.getUsage());
+  } else {
+    // Pretend we're running test.dart so that TestUtils doesn't get confused
+    // about the "current directory." This is only used if we're trying to run
+    // this file independently for local testing.
+    TestUtils.testScriptPath = new Path(new Options().script)
+        .directoryPath
+        .join(new Path('../../test.dart'))
+        .canonicalize()
+        .toNativePath();
+    TestingServerRunner.setPackageRootDir({'mode': args['mode'],
+        'arch': args['arch'], 'system': Platform.operatingSystem,
+        'build_directory': ''});
+
+    TestingServerRunner.startHttpServer('127.0.0.1',
+        port: int.parse(args['port']));
+    print('Server listening on port '
+          '${TestingServerRunner.serverList[0].port}.');
+    TestingServerRunner.startHttpServer('127.0.0.1',
+        allowedPort: TestingServerRunner.serverList[0].port, port:
+        int.parse(args['crossOriginPort']));
+    print(
+        'Server listening on port ${TestingServerRunner.serverList[1].port}.');
+  }
+}
 /**
  * Runs a set of servers that are initialized specifically for the needs of our
  * test framework, such as dealing with package-root.