Added support for running an HTTP server during the test and being able to serve up static files. L…

utils/testrunner/testrunner.dart

 //#!/usr/bin/env 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.
 
 /**
  * testrunner is a program to run Dart unit tests. Unlike $DART/tools/test.dart,
  * this program is intended for 3rd parties to be able to run unit tests in
  * a batched fashion. As such, it adds some features and removes others. Some
  * of the removed features are:
@@ skipping 53 matching lines @@
  * create or update the layout files (and implicitly pass the tests).
  */
 
 // TODO - layout tests that use PNGs rather than DRT text render dumps.
 #library('testrunner');
 #import('dart:io');
 #import('dart:isolate');
 #import('dart:math');
 #import('../../pkg/args/lib/args.dart');
 
+#source('client_server_task.dart');
 #source('configuration.dart');
-#source('dart_task.dart');
 #source('dart_wrap_task.dart');
 #source('dart2js_task.dart');
 #source('delete_task.dart');
-#source('drt_task.dart');
 #source('html_wrap_task.dart');
 #source('macros.dart');
 #source('options.dart');
 #source('pipeline_runner.dart');
 #source('pipeline_task.dart');
 #source('run_process_task.dart');
 #source('utils.dart');
 
 /** The set of [PipelineRunner]s to execute. */
 List _tasks;
@@ skipping 77 matching lines @@
     // by these two templates.
     var HTMLFile =
         '${Macros.directory}$pathSep${Macros.filenameNoExtension}.html';
     var CSSFile =
         '${Macros.directory}$pathSep${Macros.filenameNoExtension}.css';
     pipeline.add(new HtmlWrapTask(Macros.fullFilePath,
         HTMLFile, tempHTMLFile, CSSFile, tempCSSFile));
   }
 
   // Add the execution step.
+  var command;
+  var flags;
+  var task;
   if (runtime == 'vm' || config.layoutPixel || config.layoutText) {
+    command = config.dartPath;
     if (checkedMode) {
-      pipeline.add(new DartTask.checked(tempDartFile));
+      flags = ['--enable_asserts', '--enable_type_checks', tempDartFile];
     } else {
-      pipeline.add(new DartTask(tempDartFile));
+      flags = [tempDartFile];
     }
   } else {
-    pipeline.add(new DrtTask(Macros.fullFilePath, tempHTMLFile));
+    command = config.drtPath;
+    flags = ['--no-timeout', tempHTMLFile];
   }
+  if (config.runServer) {
+    task = new RunClientServerTask(command, flags, config.timeout);
+  } else {
+    task = new RunProcessTask(command, flags, config.timeout);
+  }
+  pipeline.add(task);
   return pipeline;
 }
 
 /**
  * Given a [List] of [testFiles], either print the list or create
  * and execute pipelines for the files.
  */
 void processTests(List pipelineTemplate, List testFiles) {
   _outStream = getStream(config.outputStream);
   _logStream = getStream(config.logStream);
@@ skipping 95 matching lines @@
         }
         buildFileList(dirs,
             new RegExp(options['test-file-pattern']), options['recurse'],
             (f) => processTests(pipelineTemplate, f));
       }
     }
   }
 }