Skip to content

Commit af866c0

Browse files
Add a WinCairo EWS queue
https://bugs.webkit.org/show_bug.cgi?id=179390 Reviewed by Lucas Forschler. * QueueStatusServer/config/queues.py: * QueueStatusServer/model/queues.py: * Scripts/webkitpy/common/config/ews.json: * Scripts/webkitpy/common/config/ports.py: * Scripts/webkitpy/common/config/ports_unittest.py: * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@224549 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 8ec73fc commit af866c0

File tree

7 files changed

+37
-0
lines changed

7 files changed

+37
-0
lines changed

Tools/ChangeLog

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2017-11-07 Don Olmstead <[email protected]>
2+
3+
Add a WinCairo EWS queue
4+
https://bugs.webkit.org/show_bug.cgi?id=179390
5+
6+
Reviewed by Lucas Forschler.
7+
8+
* QueueStatusServer/config/queues.py:
9+
* QueueStatusServer/model/queues.py:
10+
* Scripts/webkitpy/common/config/ews.json:
11+
* Scripts/webkitpy/common/config/ports.py:
12+
* Scripts/webkitpy/common/config/ports_unittest.py:
13+
* Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
14+
115
2017-11-07 Aakash Jain <[email protected]>
216

317
fix check-webkit-style errors in webkitpy about not having two spaces before inline comment

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+
"wincairo-ews",
4647
"wpe-ews",
4748
]
4849

Tools/QueueStatusServer/model/queues.py

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ def display_name(self):
8181
display_name = display_name.replace("Jsc", "JSC")
8282
display_name = display_name.replace("Wpe", "WPE")
8383
display_name = display_name.replace("Gtk", "GTK")
84+
display_name = display_name.replace("Wincairo", "WinCairo")
8485
return display_name
8586

8687
_dash_regexp = re.compile("-")

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

+8
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,14 @@
6666
"runTests": true,
6767
"shouldBuild": false
6868
},
69+
"WinCairo EWS": {
70+
"port": "wincairo",
71+
"name": "wincairo-ews",
72+
"runTests": false,
73+
"watchers": [
74+
75+
]
76+
},
6977
"WPE EWS": {
7078
"port": "wpe",
7179
"watchers": [

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

+6
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,12 @@ def run_webkit_tests_command(self, build_style=None):
189189
class WinCairoPort(DeprecatedPort):
190190
port_flag_name = "wincairo"
191191

192+
def build_webkit_command(self, build_style=None):
193+
command = super(WinCairoPort, self).build_webkit_command(build_style=build_style)
194+
command.append('--wincairo')
195+
command.append('--64-bit')
196+
return command
197+
192198

193199
class GtkWK2Port(DeprecatedPort):
194200
port_flag_name = "gtk-wk2"

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

+6
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,9 @@ def test_wpe_port(self):
5555
self.assertEqual(WpePort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--wpe"])
5656
self.assertEqual(WpePort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--wpe", "--update-wpe", DeprecatedPort().makeArgs()])
5757
self.assertEqual(WpePort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--wpe", "--update-wpe", DeprecatedPort().makeArgs()])
58+
59+
def test_wincairo_port(self):
60+
self.assertEqual(WinCairoPort().flag(), "--port=wincairo")
61+
self.assertEqual(WinCairoPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--wincairo"])
62+
self.assertEqual(WinCairoPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--wincairo", "--64-bit", DeprecatedPort().makeArgs()])
63+
self.assertEqual(WinCairoPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--wincairo", "--64-bit", DeprecatedPort().makeArgs()])

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

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ def test_ews_name(self):
204204
'webkitpy-ews',
205205
'win-ews',
206206
'wpe-ews',
207+
'wincairo-ews',
207208
}
208209
classes = AbstractEarlyWarningSystem.load_ews_classes()
209210
names = {cls.name for cls in classes}

0 commit comments

Comments
 (0)