Title: [177770] trunk/LayoutTests
- Revision
- 177770
- Author
- [email protected]
- Date
- 2014-12-27 14:33:35 -0800 (Sat, 27 Dec 2014)
Log Message
Disable W3C test harness timeout
https://bugs.webkit.org/show_bug.cgi?id=139963
Reviewed by Darin Adler.
Timeouts should depend on build style (e.g. ASan is much slower), and these don't.
* http/tests/w3c/resources/testharness.js:
* resources/testharness.js:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (177769 => 177770)
--- trunk/LayoutTests/ChangeLog 2014-12-27 21:25:08 UTC (rev 177769)
+++ trunk/LayoutTests/ChangeLog 2014-12-27 22:33:35 UTC (rev 177770)
@@ -1,3 +1,15 @@
+2014-12-27 Alexey Proskuryakov <[email protected]>
+
+ Disable W3C test harness timeout
+ https://bugs.webkit.org/show_bug.cgi?id=139963
+
+ Reviewed by Darin Adler.
+
+ Timeouts should depend on build style (e.g. ASan is much slower), and these don't.
+
+ * http/tests/w3c/resources/testharness.js:
+ * resources/testharness.js:
+
2014-12-27 Csaba Osztrogonác <[email protected]>
Unreviewed typo fix.
Modified: trunk/LayoutTests/http/tests/w3c/resources/testharness.js (177769 => 177770)
--- trunk/LayoutTests/http/tests/w3c/resources/testharness.js 2014-12-27 21:25:08 UTC (rev 177769)
+++ trunk/LayoutTests/http/tests/w3c/resources/testharness.js 2014-12-27 22:33:35 UTC (rev 177770)
@@ -385,12 +385,13 @@
(function ()
{
var debug = false;
- // default timeout is 10 seconds, test can override if needed
+ // For WebKit, we set harness timeout to a very large value, expecting run-webkit-tests
+ // to enforce the right one.
var settings = {
output:true,
harness_timeout:{
- "normal":10000,
- "long":60000
+ "normal":1000000,
+ "long":1000000
},
test_timeout:null
};
Modified: trunk/LayoutTests/resources/testharness.js (177769 => 177770)
--- trunk/LayoutTests/resources/testharness.js 2014-12-27 21:25:08 UTC (rev 177769)
+++ trunk/LayoutTests/resources/testharness.js 2014-12-27 22:33:35 UTC (rev 177770)
@@ -15,12 +15,13 @@
(function ()
{
var debug = false;
- // default timeout is 10 seconds, test can override if needed
+ // For WebKit, we set harness timeout to a very large value, expecting run-webkit-tests
+ // to enforce the right one.
var settings = {
output:false,
harness_timeout:{
- "normal":10000,
- "long":60000
+ "normal":1000000,
+ "long":1000000
},
test_timeout:null
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
