Title: [87757] trunk/Tools
- Revision
- 87757
- Author
- [email protected]
- Date
- 2011-05-31 15:26:55 -0700 (Tue, 31 May 2011)
Log Message
2011-05-31 Dirk Pranke <[email protected]>
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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (87756 => 87757)
--- trunk/Tools/ChangeLog 2011-05-31 22:13:06 UTC (rev 87756)
+++ trunk/Tools/ChangeLog 2011-05-31 22:26:55 UTC (rev 87757)
@@ -1,3 +1,12 @@
+2011-05-31 Dirk Pranke <[email protected]>
+
+ 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 <[email protected]>
Reviewed by David Kilzer.
Modified: trunk/Tools/Scripts/new-run-webkit-tests (87756 => 87757)
--- trunk/Tools/Scripts/new-run-webkit-tests 2011-05-31 22:13:06 UTC (rev 87756)
+++ trunk/Tools/Scripts/new-run-webkit-tests 2011-05-31 22:26:55 UTC (rev 87757)
@@ -50,8 +50,11 @@
env['PYTHONPATH'] = script_dir
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)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
