Revert r13286 "Fix issues with test.dart that appeared on Mac."

tools/testing/dart/test_runner.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.
 
 /**
  * Classes and methods for executing tests.
  *
  * This module includes:
  * - Managing parallel execution of tests, including timeout checks.
  * - Evaluating the output of each test as pass/fail/crash/timeout.
@@ skipping 736 matching lines @@
     }
   }
 
   Future terminate() {
     if (_process == null) return new Future.immediate(true);
     Completer completer = new Completer();
     _process.onExit = (exitCode) {
       _process.close();
       completer.complete(true);
     };
-    _process.kill();
+    if (_isWebDriver && Platform.operatingSystem == 'windows') {
+      // Use a graceful shutdown so our Selenium script can close
+      // the open browser processes. TODO(jmesserly): Send a signal once
+      // that's supported in Windows.
+      _process.stdin.write('--terminate\n'.charCodes());
+
+      // In case the run_selenium process didn't close, kill it after 30s
+      int shutdownMillisecs = 30000;
+      new Timer(shutdownMillisecs, (e) { if (!closed) _process.kill(); });

[Mads Ager (google), 2012/10/09 06:16:57]

Please don't do this. If you add a 30 sec timeout the test script will hang for
30 seconds even when the processes die. Instead, if this is really needed on
Windows, set up a timer that you cancel when the process terminates.

+    } else {
+      _process.kill();
+    }
+
     return completer.future;
   }
 
   void doStartTest(TestCase testCase) {
     _startTime = new Date.now();
     _testStdout = [];
     _testStderr = [];
     _status = null;
     _stdoutDrained = false;
     _stderrDrained = false;
@@ skipping 465 matching lines @@
         // the developer doesn't waste his or her time trying to fix a bunch of
         // tests that appear to be broken but were actually just flakes that
         // didn't get retried because there had already been one failure.
         bool allowRetry = _MAX_FAILED_NO_RETRY > _progress.numFailedTests;
         new RunningProcess(test, allowRetry, this).start();
       }
       _numProcesses++;
     }
   }
 }