Title: [119588] trunk/Tools
- Revision
- 119588
- Author
- [email protected]
- Date
- 2012-06-06 06:09:04 -0700 (Wed, 06 Jun 2012)
Log Message
[Qt] run-qtwebkit-tests hangs with -j1
run-qtwebkit-tests used to hang when wk2 API tests were run with -j1 and --timeout.
This could happen due to an uncancelled timer after results were returned. This timer was
started only if --timeout was set.
https://bugs.webkit.org/show_bug.cgi?id=85475
Patch by János Badics <[email protected]> on 2012-06-06
Reviewed by Csaba Osztrogonác.
* Scripts/run-qtwebkit-tests:
(run_test):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (119587 => 119588)
--- trunk/Tools/ChangeLog 2012-06-06 12:24:32 UTC (rev 119587)
+++ trunk/Tools/ChangeLog 2012-06-06 13:09:04 UTC (rev 119588)
@@ -1,3 +1,16 @@
+2012-06-06 János Badics <[email protected]>
+
+ [Qt] run-qtwebkit-tests hangs with -j1
+ run-qtwebkit-tests used to hang when wk2 API tests were run with -j1 and --timeout.
+ This could happen due to an uncancelled timer after results were returned. This timer was
+ started only if --timeout was set.
+ https://bugs.webkit.org/show_bug.cgi?id=85475
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/run-qtwebkit-tests:
+ (run_test):
+
2012-06-06 Michael Brüning <[email protected]>
[Qt][WK2] Add preferredMinimumContentsWidth to the viewport info in MiniBrowser.
Modified: trunk/Tools/Scripts/run-qtwebkit-tests (119587 => 119588)
--- trunk/Tools/Scripts/run-qtwebkit-tests 2012-06-06 12:24:32 UTC (rev 119587)
+++ trunk/Tools/Scripts/run-qtwebkit-tests 2012-06-06 13:09:04 UTC (rev 119588)
@@ -154,6 +154,8 @@
else:
test_suite.set_output(tst.communicate()[0]) # takes stdout only, in developer mode it would be None.
log.info("Finished %s", test_suite.test_file_name())
+ if timeout:
+ timer.cancel()
return test_suite
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
