diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 09:42:44 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 09:42:44 +0100 |
| commit | a59391482883479a9b28a6f1ace6d1ebd08a7ecd (patch) | |
| tree | fa539db054a20a67bff2fc891c33b0f4ec632916 /Tools/Scripts/webkitpy | |
| parent | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (diff) | |
| download | qtwebkit-a59391482883479a9b28a6f1ace6d1ebd08a7ecd.tar.gz | |
Imported WebKit commit 7bcdfab9a40db7d16b4b95bb77d78b8a59c9e701 (http://svn.webkit.org/repository/webkit/trunk@134025)
New snapshot with numerious build fixes, including MSVC 2012 and ARM Thumb-2.
Diffstat (limited to 'Tools/Scripts/webkitpy')
| -rw-r--r-- | Tools/Scripts/webkitpy/common/config/committers.py | 2 | ||||
| -rw-r--r-- | Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py | 6 | ||||
| -rw-r--r-- | Tools/Scripts/webkitpy/tool/servers/gardeningserver.py | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/Tools/Scripts/webkitpy/common/config/committers.py b/Tools/Scripts/webkitpy/common/config/committers.py index 3931c5c39..36df3dbcc 100644 --- a/Tools/Scripts/webkitpy/common/config/committers.py +++ b/Tools/Scripts/webkitpy/common/config/committers.py @@ -321,11 +321,13 @@ committers_unable_to_review = [ Committer("Kristof Kosztyo", "kkristof@inf.u-szeged.hu", "kkristof"), Committer("Krzysztof Kowalczyk", "kkowalczyk@gmail.com"), Committer("Kwang Yul Seo", ["skyul@company100.net", "kseo@webkit.org"], "kseo"), + Committer("Lauro Neto", "lauro.neto@openbossa.org", "lmoura"), Committer("Leandro Gracia Gil", "leandrogracia@chromium.org", "leandrogracia"), Committer("Leandro Pereira", ["leandro@profusion.mobi", "leandro@webkit.org"], "acidx"), Committer("Leo Yang", ["leoyang@rim.com", "leoyang@webkit.org", "leoyang.webkit@gmail.com"], "leoyang"), Committer("Lucas De Marchi", ["demarchi@webkit.org", "lucas.demarchi@profusion.mobi"], "demarchi"), Committer("Lucas Forschler", ["lforschler@apple.com"], "lforschler"), + Committer("Luciano Wolf", "luciano.wolf@openbossa.org", "luck"), Committer("Luke Macpherson", ["macpherson@chromium.org", "macpherson@google.com"], "macpherson"), Committer("Mads Ager", "ager@chromium.org"), Committer("Mahesh Kulkarni", ["mahesh.kulkarni@nokia.com", "maheshk@webkit.org"], "maheshk"), diff --git a/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py b/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py index c5875b6f2..b7d5df31e 100644 --- a/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py +++ b/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py @@ -158,11 +158,17 @@ class EflEWS(AbstractEarlyWarningSystem): class QtEWS(AbstractEarlyWarningSystem): name = "qt-ews" port_name = "qt" + watchers = AbstractEarlyWarningSystem.watchers + [ + "webkit-ews@sed.inf.u-szeged.hu", + ] class QtWK2EWS(AbstractEarlyWarningSystem): name = "qt-wk2-ews" port_name = "qt" + watchers = AbstractEarlyWarningSystem.watchers + [ + "webkit-ews@sed.inf.u-szeged.hu", + ] class WinEWS(AbstractEarlyWarningSystem): diff --git a/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py b/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py index e57aff119..e89c2a08a 100644 --- a/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py +++ b/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py @@ -23,6 +23,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import BaseHTTPServer +import SocketServer import logging import json import os @@ -52,7 +53,7 @@ class BuildCoverageExtrapolator(object): return self._covered_test_configurations_for_builder_name()[builder_name] -class GardeningHTTPServer(BaseHTTPServer.HTTPServer): +class GardeningHTTPServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer): def __init__(self, httpd_port, config): server_name = '' self.tool = config['tool'] @@ -82,9 +83,6 @@ class GardeningHTTPRequestHandler(ReflectionHandler): allow_cross_origin_requests = True debug_output = '' - def _run_webkit_patch(self, args): - return self.server.tool.executive.run_command([self.server.tool.path()] + args, cwd=self.server.tool.scm().checkout_root) - def rollout(self): revision = self.query['revision'][0] reason = self.query['reason'][0] |