Skip to content

Commit 0e76046

Browse files
Add a WPE EWS queue
https://bugs.webkit.org/show_bug.cgi?id=172693 Reviewed by Carlos Garcia Campos. * QueueStatusServer/config/queues.py: * QueueStatusServer/model/queues.py: Capitalize the name of the port on the tooltip of the bubbles. Do the same for the GTK port. (Queue.display_name): * Scripts/webkitpy/common/config/ews.json: Update the watcher mail for the GTK+ EWS also. Set for both ports as watcher the alias [email protected] that maintainers of both ports follow. * Scripts/webkitpy/common/config/ports.py: (DeprecatedPort.port): (WpePort): (WpePort.build_webkit_command): (WpePort.run_webkit_tests_command): * Scripts/webkitpy/common/config/ports_unittest.py: (DeprecatedPortTest): (DeprecatedPortTest.test_wpe_port): * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py: (test_ews_name): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@217555 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 65d50e8 commit 0e76046

File tree

7 files changed

+59
-1
lines changed

7 files changed

+59
-1
lines changed

Tools/ChangeLog

+25
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
2017-05-30 Carlos Alberto Lopez Perez <[email protected]>
2+
3+
Add a WPE EWS queue
4+
https://bugs.webkit.org/show_bug.cgi?id=172693
5+
6+
Reviewed by Carlos Garcia Campos.
7+
8+
* QueueStatusServer/config/queues.py:
9+
* QueueStatusServer/model/queues.py: Capitalize the name of the
10+
port on the tooltip of the bubbles. Do the same for the GTK port.
11+
(Queue.display_name):
12+
* Scripts/webkitpy/common/config/ews.json: Update the watcher mail
13+
for the GTK+ EWS also. Set for both ports as watcher the alias
14+
[email protected] that maintainers of both ports follow.
15+
* Scripts/webkitpy/common/config/ports.py:
16+
(DeprecatedPort.port):
17+
(WpePort):
18+
(WpePort.build_webkit_command):
19+
(WpePort.run_webkit_tests_command):
20+
* Scripts/webkitpy/common/config/ports_unittest.py:
21+
(DeprecatedPortTest):
22+
(DeprecatedPortTest.test_wpe_port):
23+
* Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
24+
(test_ews_name):
25+
126
2017-05-29 Zan Dobersek <[email protected]>
227

328
Unreviewed. Bumping the WPEBackend-mesa dependency version.

Tools/QueueStatusServer/config/queues.py

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"mac-debug-ews",
4444
"mac-32bit-ews",
4545
"win-ews",
46+
"wpe-ews",
4647
]
4748

4849
# If the patch is still active after this much time, then a bot must have frozen or rebooted,

Tools/QueueStatusServer/model/queues.py

+2
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ def display_name(self):
7979
display_name = display_name.replace("Ews", "EWS")
8080
display_name = display_name.replace("Ios", "iOS")
8181
display_name = display_name.replace("Jsc", "JSC")
82+
display_name = display_name.replace("Wpe", "WPE")
83+
display_name = display_name.replace("Gtk", "GTK")
8284
return display_name
8385

8486
_dash_regexp = re.compile("-")

Tools/Scripts/webkitpy/common/config/ews.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"GTK WK2 EWS": {
33
"port": "gtk-wk2",
44
"watchers": [
5-
5+
66
]
77
},
88
"Win EWS": {
@@ -58,5 +58,11 @@
5858
"group": "bindings",
5959
"runTests": true,
6060
"shouldBuild": false
61+
},
62+
"WPE EWS": {
63+
"port": "wpe",
64+
"watchers": [
65+
66+
]
6167
}
6268
}

Tools/Scripts/webkitpy/common/config/ports.py

+17
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def port(port_name):
7272
"mac-wk2": MacWK2Port,
7373
"win": WinPort,
7474
"wincairo": WinCairoPort,
75+
"wpe": WpePort,
7576
}
7677
default_port = {
7778
"Windows": WinPort,
@@ -200,3 +201,19 @@ def run_webkit_tests_command(self, build_style=None):
200201
command = super(GtkWK2Port, self).run_webkit_tests_command(build_style)
201202
command.append("--gtk")
202203
return command
204+
205+
206+
class WpePort(DeprecatedPort):
207+
port_flag_name = "wpe"
208+
209+
def build_webkit_command(self, build_style=None):
210+
command = super(WpePort, self).build_webkit_command(build_style=build_style)
211+
command.append("--wpe")
212+
command.append("--update-wpe")
213+
command.append(super(WpePort, self).makeArgs())
214+
return command
215+
216+
def run_webkit_tests_command(self, build_style=None):
217+
command = super(WpePort, self).run_webkit_tests_command(build_style)
218+
command.append("--wpe")
219+
return command

Tools/Scripts/webkitpy/common/config/ports_unittest.py

+6
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,9 @@ def test_gtk_wk2_port(self):
4949
self.assertEqual(GtkWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk"])
5050
self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
5151
self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
52+
53+
def test_wpe_port(self):
54+
self.assertEqual(WpePort().flag(), "--port=wpe")
55+
self.assertEqual(WpePort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--wpe"])
56+
self.assertEqual(WpePort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--wpe", "--update-wpe", DeprecatedPort().makeArgs()])
57+
self.assertEqual(WpePort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--wpe", "--update-wpe", DeprecatedPort().makeArgs()])

Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py

+1
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ def test_ews_name(self):
185185
'mac-32bit-ews',
186186
'bindings-ews',
187187
'jsc-ews',
188+
'wpe-ews',
188189
}
189190
classes = AbstractEarlyWarningSystem.load_ews_classes()
190191
names = {cls.name for cls in classes}

0 commit comments

Comments
 (0)