Title: [188125] trunk/Tools
- Revision
- 188125
- Author
- carlo...@webkit.org
- Date
- 2015-08-07 08:28:01 -0700 (Fri, 07 Aug 2015)
Log Message
[GTK] WTF unit tests are timing out in the bots
https://bugs.webkit.org/show_bug.cgi?id=147777
Reviewed by Filip Pizlo.
Add a way to mark google unit tests as slow and add
WTF_Lock.ContentedShortSection to the list. In case of slow test
we use the double of the given timeout for that particular test.
* Scripts/run-gtk-tests:
(TestRunner):
(TestRunner._run_google_test):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (188124 => 188125)
--- trunk/Tools/ChangeLog 2015-08-07 11:17:24 UTC (rev 188124)
+++ trunk/Tools/ChangeLog 2015-08-07 15:28:01 UTC (rev 188125)
@@ -1,5 +1,20 @@
2015-08-07 Carlos Garcia Campos <cgar...@igalia.com>
+ [GTK] WTF unit tests are timing out in the bots
+ https://bugs.webkit.org/show_bug.cgi?id=147777
+
+ Reviewed by Filip Pizlo.
+
+ Add a way to mark google unit tests as slow and add
+ WTF_Lock.ContentedShortSection to the list. In case of slow test
+ we use the double of the given timeout for that particular test.
+
+ * Scripts/run-gtk-tests:
+ (TestRunner):
+ (TestRunner._run_google_test):
+
+2015-08-07 Carlos Garcia Campos <cgar...@igalia.com>
+
[GTK] run-gtk-tests should not stop when a google test case fails
https://bugs.webkit.org/show_bug.cgi?id=147778
Modified: trunk/Tools/Scripts/run-gtk-tests (188124 => 188125)
--- trunk/Tools/Scripts/run-gtk-tests 2015-08-07 11:17:24 UTC (rev 188124)
+++ trunk/Tools/Scripts/run-gtk-tests 2015-08-07 15:28:01 UTC (rev 188125)
@@ -80,6 +80,10 @@
SkippedTest("WebKit2/TestWebKit2", "WebKit2.GeolocationTransitionToLowAccuracy", "Test causes crash on the next test", 125068),
]
+ SLOW = [
+ "WTF_Lock.ContentedShortSection",
+ ]
+
def __init__(self, options, tests=[]):
self._options = options
@@ -340,7 +344,10 @@
def _run_google_test(self, test_program, subtest):
test_command = [test_program, '--gtest_filter=%s' % (subtest)]
- return self._run_test_command(test_command, self._options.timeout)
+ timeout = self._options.timeout
+ if subtest in TestRunner.SLOW:
+ timeout *= 2
+ return self._run_test_command(test_command, timeout)
def _run_google_test_suite(self, test_program):
retcode = 0
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
