Change the location of the output directory of generated tests to be inside output directory, but n…

tools/testing/dart/http_server.dart

Index: tools/testing/dart/http_server.dart
===================================================================
--- tools/testing/dart/http_server.dart	(revision 17372)
+++ tools/testing/dart/http_server.dart	(working copy)
@@ -39,10 +39,11 @@
         .join(new Path('../../test.dart'))
         .canonicalize()
         .toNativePath();
-    TestingServerRunner.setPackageRootDir({'mode': args['mode'],
-        'arch': args['arch'], 'system': Platform.operatingSystem,
-        'build_directory': ''});
-
+    var conf = {'mode': args['mode'],
+                'arch': args['arch'], 'system': Platform.operatingSystem,
+                'build_directory': ''}
+    TestingServerRunner.setPackageRootDir(conf);
+    TestingServerRunner.setBuildDir(conf);
     TestingServerRunner.startHttpServer('127.0.0.1',
         port: int.parse(args['port']));
     print('Server listening on port '
@@ -61,16 +62,22 @@
 class TestingServerRunner {
   static List serverList = [];
   static Path _packageRootDir = null;
+  static Path _buildDirectory = null;
 
   // Added as a getter so that the function will be called again each time the
   // default request handler closure is executed.
   static Path get packageRootDir => _packageRootDir;
+  static Path get buildDirectory => _buildDirectory;
 
   static setPackageRootDir(Map configuration) {
     _packageRootDir = TestUtils.currentWorkingDirectory.join(
         new Path(TestUtils.buildDir(configuration)));
   }
 
+  static setBuildDir(Map configuration) {
+    _buildDirectory = new Path(TestUtils.buildDir(configuration));
+  }
+
   static startHttpServer(String host, {int allowedPort:-1, int port: 0}) {
     var basePath = TestUtils.dartDir();
     var httpServer = new HttpServer();
@@ -83,7 +90,14 @@
       var requestPath = new Path(request.path.substring(1)).canonicalize();
       var path = basePath.join(requestPath);
       var file = new File(path.toNativePath());
-
+      // Since the build directory may not be located directly beneath the dart
+      // root directory (if we pass it in, e.g., for dartium testing) we serve
+      // files from the build directory explicitly. Please note that if
+      // buildDirectory has the same name as a directory inside the dart repo
+      // we will server files from the buildDirectory.
+      if (path.toString().startsWith(buildDirectory.toString())) {
+        file = new File(path.toNativePath());
+      }
       if (requestPath.segments().contains(packagesDirName)) {
         // Essentially implement the packages path rewriting, so we don't have
         // to pass environment variables to the browsers.