Enable frong testing components.

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");
 
 /**
@@ skipping 15 matching lines @@
   } else if (os == 'macos') {
     buildDir = 'xcodebuild/';
   }
   buildDir += (configuration['mode'] == 'debug') ? 'Debug_' : 'Release_';
   buildDir += configuration['architecture'] + '/';
   return buildDir;
 }
 
 
 String getExecutableName(Map configuration) {
-  if (configuration['component'] == 'vm') {
-    return 'dart_bin';
-  } else if (configuration['component'] == 'dartc') {
-    return 'dartc';
-  } else {
-    throw "Unknown executable for: ${configuration['component']}";
+  switch (configuration['component']) {
+    case 'vm':
+      return 'dart_bin';
+    case 'dartc':
+      return 'dartc';
+    case 'frog':
+    case 'leg':
+      return 'frog/bin/frog';
+    case 'frogsh':
+      return 'frog/bin/frogsh';
+    default:
+      throw "Unknown executable for: ${configuration['component']}";
   }
 }
 
 
 String getDartShellFileName(Map configuration) {
   var name = getBuildDir(configuration) + getExecutableName(configuration);
   if (!(new File(name)).existsSync()) {
     throw "Executable '$name' does not exist";
   }
   return name;
 }
 
 
 class TestCase {
   String executablePath;
   List<String> arguments;
+  int timeout;
   String commandLine;
   String displayName;
   TestOutput output;
   Set<String> expectedOutcomes;
   Function completedHandler;
 
   TestCase(this.displayName, this.executablePath, this.arguments,
-           this.completedHandler, this.expectedOutcomes) {
+           this.timeout, this.completedHandler, this.expectedOutcomes) {
     commandLine = executablePath;
     for (var arg in arguments) {
       commandLine += " " + arg;
     }
   }
 
   bool get isNegative() => displayName.contains("NegativeTest");
 
   void completed() { completedHandler(this); }    
 }
@@ skipping 12 matching lines @@
   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);
   
-  bool get hasCrashed() => !timedOut && exitCode != -1 && exitCode != 0;
+  bool get hasCrashed() {
+    return !timedOut && exitCode != -1 && exitCode < 0;

[Bill Hesse, 2011/11/11 13:42:52]

Why the curly braces?

[Mads Ager (google), 2011/11/11 14:02:07]

Thanks. I'll get rid of them. I added that while debugging. :)

+  }
 
   bool get hasTimedOut() => timedOut;
 
   bool get didFail() => exitCode != 0 && !hasCrashed;
 
   // Reverse result of a negative test.
   bool get hasFailed() => (testCase.isNegative ? !didFail : didFail);
 }
 
 
@@ skipping 56 matching lines @@
     process.kill();
   }
 }
 
 
 class ProcessQueue {
   int numProcesses = 0;
   final int maxProcesses;
   Queue<TestCase> tests;
   ProgressIndicator progress;
+  var onDone;
 
-  ProcessQueue(this.maxProcesses, this.progress)
-      : tests = new Queue<TestCase>();
+  ProcessQueue(Map configuration, this.onDone)
+      : tests = new Queue<TestCase>(),
+        maxProcesses = configuration['tasks'],
+        progress = new CompactProgressIndicator();
 
   tryRunTest() {
+    if (tests.isEmpty() && numProcesses == 0) {
+      onDone();
+    }

[Bill Hesse, 2011/11/11 13:42:52]

This looks like a race condition - if one test is entered in the queue, and the
process runs and ends before a second test is entered in the queue, then
tryRunTest is called from the test.completedHandler() and this condition is
true.

[Mads Ager (google), 2011/11/11 14:02:07]

That is true. This is all temporary. I will rip it out as soon as stdout is
closed automatically when there are no other pending tasks. I'll add a TODO
comment and leave it as is until I can rip it all out. In practice the listing
happens so quickly that the problem you are describing does not occur.

     if (numProcesses < maxProcesses && !tests.isEmpty()) {
       TestCase test = tests.removeFirst();
       progress.start(test);
-      // TODO(whesse): Refactor into various test output methods.
       Function old_callback = test.completedHandler;
       Function wrapper = (TestCase test_arg) {
         numProcesses--;
         progress.done(test_arg);
         tryRunTest();
         old_callback(test_arg);
       };
       test.completedHandler = wrapper;
-        
-      // TODO(whesse): Add timeout information to TestCase, use it here.
-      new RunningProcess(test, 60).start();
+      new RunningProcess(test, test.timeout).start();
       numProcesses++;
     }
   }
 
   runTest(TestCase test) {
     progress.testAdded();
     tests.add(test);
     tryRunTest();
   }
 }