Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 5 insertions, 0 deletions

diff --git a/Tools/Scripts/webkitpy/common/system/executive_unittest.py b/Tools/Scripts/webkitpy/common/system/executive_unittest.py
index 466e2ec02..212896a4a 100644
--- a/Tools/Scripts/webkitpy/common/system/executive_unittest.py
+++ b/Tools/Scripts/webkitpy/common/system/executive_unittest.py
@@ -218,6 +218,10 @@ class ExecutiveTest(unittest.TestCase):
         self.assertTrue(os.getpid() in pids)
 
     def test_run_in_parallel(self):
+        if sys.platform in ("win32", "cygwin"):
+            return  # This function isn't implemented properly on windows yet.
+        import multiprocessing
+
         NUM_PROCESSES = 4
         DELAY_SECS = 0.25
         cmd_line = [sys.executable, '-c', 'import time; time.sleep(%f); print "hello"' % DELAY_SECS]
@@ -228,6 +232,7 @@ class ExecutiveTest(unittest.TestCase):
         done = time.time()
         self.assertTrue(done - start < NUM_PROCESSES * DELAY_SECS)
         self.assertEquals([output[1] for output in command_outputs], ["hello\n"] * NUM_PROCESSES)
+        self.assertEquals([],  multiprocessing.active_children())
 
 
 def main(platform, stdin, stdout, cmd, args):