Add package-root option to the testing scripts

tools/testing/dart/http_server.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // 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:io';
 
 import 'dart:convert' show
@@ skipping 38 matching lines @@
 
 /// Interface of the HTTP server:
 ///
 /// /echo: This will stream the data received in the request stream back
 ///        to the client.
 /// /root_dart/X: This will serve the corresponding file from the dart
 ///               directory (i.e. '$DartDirectory/X').
 /// /root_build/X: This will serve the corresponding file from the build
 ///                directory (i.e. '$BuildDirectory/X').
 /// /FOO/packages/BAR: This will serve the corresponding file from the packages
-///                    directory (i.e. '$BuildDirectory/packages/BAR')
+///                    directory (i.e. '$BuildDirectory/packages/BAR') or the 
+///                    passed in package root

[Bill Hesse, 2014/09/08 15:31:20]

passed-in package root.  Multi-word adjective phrases have hyphens between the
words.

 /// /ws: This will upgrade the connection to a WebSocket connection and echo
 ///      all data back to the client.
 ///
 /// In case a path does not refer to a file but rather to a directory, a
 /// directory listing will be displayed.
 
 const PREFIX_BUILDDIR = 'root_build';
 const PREFIX_DARTDIR = 'root_dart';
 
 // TODO(kustermann,ricow): We could change this to the following scheme:
 // http://host:port/root_packages/X -> $BuildDir/packages/X
 // Issue: 8368
 
 main(List<String> arguments) {
   // This script is in [dart]/tools/testing/dart.
   TestUtils.setDartDirUri(Platform.script.resolve('../../..'));
   /** 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.addFlag('help', abbr: 'h', negatable: false,
       help: 'Print this usage information.');
   parser.addOption('build-directory', help: 'The build directory to use.');
+  parser.addOption('package-root', help: 'The package root to use.');
   parser.addOption('network', help: 'The network interface to use.',
       defaultsTo: '0.0.0.0');
   parser.addFlag('csp', help: 'Use Content Security Policy restrictions.',
       defaultsTo: false);
   parser.addOption('runtime', help: 'The runtime we are using (for csp flags).',
       defaultsTo: 'none');
 
   var args = parser.parse(arguments);
   if (args['help']) {
     print(parser.getUsage());
   } else {
     var servers = new TestingServers(new Path(args['build-directory']),
                                      args['csp'],
-                                     args['runtime']);
+                                     args['runtime'],
+                                     null,
+                                     args['package-root']);
     var port = int.parse(args['port']);
     var crossOriginPort = int.parse(args['crossOriginPort']);
     servers.startServers(args['network'],
                          port: port,
                          crossOriginPort: crossOriginPort).then((_) {
       DebugLogger.info('Server listening on port ${servers.port}');
       DebugLogger.info('Server listening on port ${servers.crossOriginPort}');
     });
   }
 }
@@ skipping 18 matching lines @@
     "/NoSuchPart.dart",
     "/Nonexistent_library.dart",
     "/missing_file",
     "/xxx-missing.jpeg",
     "/does-not-exist.css"
   ];
 
   List _serverList = [];
   Path _buildDirectory = null;
   Path _dartDirectory = null;
+  Path _packageRoot;
   final bool useContentSecurityPolicy;
   final String runtime;
   DispatchingServer _server;
 
   TestingServers(Path buildDirectory,
                  this.useContentSecurityPolicy,
-                 [String this.runtime = 'none', String dartDirectory]) {
+                 [String this.runtime = 'none', String dartDirectory,
+                  String packageRoot]) {
     _buildDirectory = TestUtils.absolutePath(buildDirectory);
     _dartDirectory = dartDirectory == null ? TestUtils.dartDir
         : new Path(dartDirectory);
+    _packageRoot = packageRoot == null ? 
+      _buildDirectory.append('packages') :
+      new Path(packageRoot);
   }
 
   int get port => _serverList[0].port;
   int get crossOriginPort => _serverList[1].port;
   DispatchingServer get server => _server;
 
   /**
    * [startServers] will start two Http servers.
    * The first server listens on [port] and sets
    *   "Access-Control-Allow-Origin: *"
@@ skipping 10 matching lines @@
     });
   }
 
   String httpServerCommandline() {
     var dart = TestUtils.dartTestExecutable.toNativePath();
     var dartDir = TestUtils.dartDir;
     var script = dartDir.join(new Path("tools/testing/dart/http_server.dart"));
     var buildDirectory = _buildDirectory.toNativePath();
     var csp = useContentSecurityPolicy ? '--csp ' : '';
     return '$dart $script -p $port -c $crossOriginPort $csp'
-           '--build-directory=$buildDirectory --runtime=$runtime';
+           '--build-directory=$buildDirectory --runtime=$runtime '
+           '--package-root=$_packageRoot';
   }
 
   void stopServers() {
     for (var server in _serverList) {
       server.close();
     }
   }
 
   void _onError(e) {
     DebugLogger.error('HttpServer: an error occured', e);
@@ skipping 16 matching lines @@
   }
 
   void _handleFileOrDirectoryRequest(HttpRequest request,
                                      int allowedPort) {
     // Enable browsers to cache file/directory responses.
     var response = request.response;
     response.headers.set("Cache-Control",
                          "max-age=$_CACHE_EXPIRATION_IN_SECONDS");
     var path = _getFilePathFromRequestPath(request.uri.path);
     if (path != null) {
+      

[Bill Hesse, 2014/09/08 15:31:20]

Stray newline?

       var file = new File(path.toNativePath());
       file.exists().then((exists) {
         if (exists) {
           _sendFileContent(request, response, allowedPort, path, file);
         } else {
           var directory = new Directory(path.toNativePath());
           directory.exists().then((exists) {
             if (exists) {
               _listDirectory(directory).then((entries) {
                 _sendDirectoryListing(entries, request, response);
@@ skipping 50 matching lines @@
       var relativePath;
       if (pathSegments[0] == PREFIX_BUILDDIR) {
         basePath = _buildDirectory;
         relativePath = new Path(
             pathSegments.skip(1).join('/'));
       } else if (pathSegments[0] == PREFIX_DARTDIR) {
         basePath = _dartDirectory;
         relativePath = new Path(
             pathSegments.skip(1).join('/'));
       }
       var packagesDirName = 'packages';

[Bill Hesse, 2014/09/08 15:31:20]

Maybe this variable is no longer worth having - only 1 use.

       var packagesIndex = pathSegments.indexOf(packagesDirName);
       if (packagesIndex != -1) {
         var start = packagesIndex + 1;
-        basePath = _buildDirectory.append(packagesDirName);
+        basePath = _packageRoot;
         relativePath = new Path(pathSegments.skip(start).join('/'));
       }
       if (basePath != null && relativePath != null) {
         return basePath.join(relativePath);
       }
     }
     return null;
   }
 
   Future<List<_Entry>> _listDirectory(Directory directory) {
@@ skipping 149 matching lines @@
 class _Entry implements Comparable {
   final String name;
   final String displayName;
 
   _Entry(this.name, this.displayName);
 
   int compareTo(_Entry other) {
     return name.compareTo(other.name);
   }
 }