Added ability to have custom test HTTP server handlers in the test directories.

utils/testrunner/run_pipeline.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.
 
 /** The default pipeline code for running a test file. */
 library pipeline;
 import 'dart:isolate';
 import 'dart:io';
 part 'pipeline_utils.dart';
 
@@ skipping 233 matching lines @@
           [ '--out=$scriptFile', '$sourceFile' ]).
           then(runTestStage);
     }
   } else {
     runTestStage(0);
   }
 }
 
 /** Third stage of pipeline - runs the tests. */
 runTestStage(_) {
-  if (config["server"]) { // Start the HTTP server.
-    serverId = startProcess(config["dart"],
-        [ '${config["runnerDir"]}/http_server_test_runner.dart',
-          '--port=${config["port"]}',
-          '--root=${config["root"]}']);
+  if (config["server"]) {
+    var serverPath = config["testfile"];
+    // Replace .dart with _server.dart to get test's server file, if any.
+    serverPath = '${serverPath.substring(0, serverPath.length-5)}_server.dart';

[Siggi Cherem (dart-lang), 2012/10/10 17:51:32]

nit: spaces around '-', I might prefer '.dart'.length since it's a bit more
explicit.

[gram, 2012/10/17 00:03:28]

Done.

+    var serverFile = new File(serverPath);
+    if (!serverFile.existsSync()) {
+      // No custom server; run the default server.
+      serverPath = '${config["runnerDir"]}/http_server_runner.dart';
+    }
+    if (serverPath != null) {
+      var root = config["root"];
+      if (root == null) {
+        // Set the root to be the directory containing the test file.
+        root =  getDirectory(config["testfile"]);
+      }
+      // Start the HTTP server.
+      serverId = startProcess(config["dart"],
+          [ serverPath, '--port=${config["port"]}', '--root=$root']);
+    }
   }
 
   var cmd, args;
   if (config["runtime"] == 'vm' || config["layout"]) { // Run the tests.
     if (config["checked"]) {
       cmd = config["dart"];
       args = [ '--enable_asserts', '--enable_type_checks', tempDartFile ];
     } else {
       cmd = config["dart"];
       args = [ tempDartFile ];
@@ skipping 16 matching lines @@
 
   if (!config["keep-files"]) { // Remove the temporary files.
     cleanup(tempDartFile);
     cleanup(tempHtmlFile);
     cleanup(tempJsFile);
     cleanup(tempChildDartFile);
     cleanup(tempChildJsFile);
   }
   completePipeline(exitcode);
 }