Enable Dartium tests in tools/test.dart.

tools/testing/dart/test_runner.dart

 // Copyright (c) 2011, 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("test_runner");
 
 #import("status_file_parser.dart");
 #import("test_progress.dart");
 #import("test_suite.dart");
 
@@ skipping 62 matching lines @@
       arguments = newArguments;
     }
   }
 
   int get timeout() => configuration['timeout'];
 
   void completed() { completedHandler(this); }
 }
 
 
+/** RunningProcess.start() handles CompilingTestCase specially, executing

[Mads Ager (google), 2011/12/09 13:19:37]

BrowserTestCase

I would reformulate to say something about the class instead of start:

/**
  * BrowserTestCase that is handled specially by...
  */
?

+ * the compilation command line first.
+ */
+class BrowserTestCase extends TestCase {
+  String compilerPath;
+  List<String> compilerArguments;
+
+  BrowserTestCase(displayName,
+                    this.compilerPath,
+                    this.compilerArguments,
+                    executablePath,
+                    arguments,
+                    configuration,
+                    completedHandler,
+                    expectedOutcomes,
+                    [isNegative = false]) : super(displayName,
+                                                  executablePath,
+                                                  arguments,
+                                                  configuration,
+                                                  completedHandler,
+                                                  expectedOutcomes,
+                                                  isNegative);
+}
+
+
+
 class TestOutput {
   // The TestCase this is the output from.
   TestCase testCase;
   int exitCode;
   bool timedOut;
   bool failed = false;
   List<String> stdout;
   List<String> stderr;
   Duration time;
 
   TestOutput(this.testCase, this.exitCode, this.timedOut, this.stdout,
              this.stderr, this.time) {
     testCase.output = this;
   }
 
   String get result() =>
       hasCrashed ? CRASH : (hasTimedOut ? TIMEOUT : (hasFailed ? FAIL : PASS));
 
   bool get unexpectedOutput() => !testCase.expectedOutcomes.contains(result);
 
-  // The Java dartc runner exits with code 253 in case of unhandles
+  // The Java dartc runner exits with code 253 in case of unhandled
   // exceptions.
   // The VM uses std::abort to terminate on asserts.
   // std::abort terminates with exit code 3 on Windows.
   bool get hasCrashed() {
     if (new Platform().operatingSystem() == 'windows') {
       if (exitCode == 3) {
         return !timedOut;
       }
       return (!timedOut &&
               (exitCode != -1) &&
               (exitCode < 0) &&
               ((0x3FFFFF00 & exitCode) == 0));
     }
     return (!timedOut &&
             (exitCode != -1) &&
             ((exitCode < 0) || (exitCode == 253)));
   }
 
   bool get hasTimedOut() => timedOut;
 
-  bool get didFail() => exitCode != 0 && !hasCrashed;
+  bool get didFail() {
+    if (exitCode != 0 && !hasCrashed) return true;
+
+    // Browser tests fail unless stdout contains
+    // 'Content-Type: text/plain\nPASS'.
+    if (testCase is !BrowserTestCase) return false;
+    String previous_line = '';
+    for (String line in stdout) {
+      if (line == 'PASS' && previous_line == 'Content-Type: text/plain') {
+        return false;
+      }
+      previous_line = line;
+    }
+    return true;
+  }
 
   // Reverse result of a negative test.
   bool get hasFailed() => (testCase.isNegative ? !didFail : didFail);
 }
 
 
 class RunningProcess {
   Process process;
   TestCase testCase;
   bool timedOut = false;
   Date startTime;
   Timer timeoutTimer;
   List<String> stdout;
   List<String> stderr;
   List<Function> handlers;
 
   RunningProcess(this.testCase);
 
   void exitHandler(int exitCode) {
     new TestOutput(testCase, exitCode, timedOut, stdout,
                    stderr, new Date.now().difference(startTime));
     process.close();
     timeoutTimer.cancel();
     testCase.completed();
   }
 
+  void compilerExitHandler(int exitCode) {
+    if (exitCode != 0) {
+      exitHandler(exitCode);
+    } else {
+      runCommand(testCase.executablePath, testCase.arguments, exitHandler);
+    }
+  }
+      
   void makeReadHandler(StringInputStream source, List<String> destination) {
     return () {
       if (source.closed) return;  // TODO(whesse): Remove when bug is fixed.
       var line = source.readLine();
       while (null != line) {
         destination.add(line);
         line = source.readLine();
       }
     };
   }
 
   void start() {
     Expect.isFalse(testCase.expectedOutcomes.contains(SKIP));
-    process = new Process(testCase.executablePath, testCase.arguments);
+    stdout = new List<String>();
+    stderr = new List<String>();
+    if (testCase is BrowserTestCase) {
+      runCommand(testCase.compilerPath,
+                 testCase.compilerArguments,
+                 compilerExitHandler);
+    } else {
+      runCommand(testCase.executablePath, testCase.arguments, exitHandler);
+    }
+  }
+
+  void runCommand(String executable,
+                  List<String> arguments,
+                  void exitHandler(int exitCode)) {
+    process = new Process(executable, arguments);
     process.exitHandler = exitHandler;
     startTime = new Date.now();
     process.start();
-
     InputStream stdoutStream = process.stdout;
     InputStream stderrStream = process.stderr;
-    stdout = new List<String>();
-    stderr = new List<String>();
     StringInputStream stdoutStringStream = new StringInputStream(stdoutStream);
     StringInputStream stderrStringStream = new StringInputStream(stderrStream);
     stdoutStringStream.dataHandler =
         makeReadHandler(stdoutStringStream, stdout);
     stderrStringStream.dataHandler =
         makeReadHandler(stderrStringStream, stderr);
     timeoutTimer = new Timer(timeoutHandler, 1000 * testCase.timeout, false);
   }
 

[Mads Ager (google), 2011/12/09 13:19:37]

Remove the extra new lines.

+
+
   void timeoutHandler(Timer unusedTimer) {
     timedOut = true;
     process.kill();
   }
 }
 
 
 class DartcBatchRunnerProcess {
   String _executable;
 
@@ skipping 215 matching lines @@
       if (test.configuration['component'] == 'dartc') {
         _ensureDartcBatchRunnersStarted(test.executablePath);
         _getDartcBatchRunnerProcess().startTest(test);
       } else {
         new RunningProcess(test).start();
       }
       _numProcesses++;
     }
   }
 }