Changeset 87757 in webkit

Timestamp:

May 31, 2011 3:26:55 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-05-31 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Tony Chang.

new-run-webkit-tests: doesn't wait for children if it gets a ctrl-c
​https://bugs.webkit.org/show_bug.cgi?id=60241

• Scripts/new-run-webkit-tests:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/new-run-webkit-tests (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-31  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        new-run-webkit-tests: doesn't wait for children if it gets a ctrl-c
+        https://bugs.webkit.org/show_bug.cgi?id=60241
+
+        * Scripts/new-run-webkit-tests:
+
 2011-05-31  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/Scripts/new-run-webkit-tests

@@ -51 +51 @@
     module_path = os.path.join(script_dir, 'webkitpy', 'layout_tests', 'run_webkit_tests.py')
     cmd = [sys.executable, module_path] + sys.argv[1:]
+    proc = subprocess.Popen(cmd, env=env)
     try:
-        sys.exit(subprocess.call(cmd, env=env))
+        proc.wait()
     except KeyboardInterrupt:
-        # this mirrors what the shell normally does
-        sys.exit(signal.SIGINT + 128)
+        # We need a second wait in order to make sure the subprocess exits fully.
+        # FIXME: It would be nice if we could put a timeout on this.
+        proc.wait()
+    sys.exit(proc.returncode)