Revert "Change the location of the output directory" plus one other fix.

tools/testing/dart/http_server.dart

 // Copyright (c) 2012, 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:io';
 import 'dart:isolate';
 import 'test_suite.dart';  // For TestUtils.
 // TODO(efortuna): Rewrite to not use the args library and simply take an
@@ skipping 22 matching lines @@
     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();
-    // Note: args['package-root'] is always the build directory. We have the
-    // implicit assumption that it contains the 'packages' subdirectory.
-    // TODO: We should probably rename 'package-root' to 'build-directory'.
     TestingServerRunner._packageRootDir = new Path(args['package-root']);
-    TestingServerRunner._buildDirectory = new Path(args['package-root']);
     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.
  */
 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();
     var packagesDirName = 'packages';
     httpServer.onError = (e) {
       // TODO(ricow): Once we have a debug log we should write this out there.
       print('Test http server error: $e');
     };
     httpServer.defaultRequestHandler = (request, resp) {
-      // TODO(kustermann,ricow): We could change this to the following scheme:
-      // http://host:port/root_dart/X     -> $DartDir/X
-      // http://host:port/root_build/X    -> $BuildDir/X
-      // http://host:port/root_packages/X -> $BuildDir/packages/X
-      // Issue: 8368
-
       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 (requestPath.toString().startsWith(buildDirectory.toString())) {
-        file = new File(requestPath.toNativePath());
-      }
+
       if (requestPath.segments().contains(packagesDirName)) {
         // Essentially implement the packages path rewriting, so we don't have
         // to pass environment variables to the browsers.
         var requestPathStr = requestPath.toNativePath().substring(
             requestPath.toNativePath().indexOf(packagesDirName));
         path = packageRootDir.append(requestPathStr);
         file = new File(path.toNativePath());
       }
       file.exists().then((exists) {
         if (exists) {
@@ skipping 38 matching lines @@
     });
 
     httpServer.listen(host, port);
     serverList.add(httpServer);
   }
 
   static terminateHttpServers() {
     for (var server in serverList) server.close();
   }
 }