Diff
Modified: trunk/Tools/ChangeLog (159674 => 159675)
--- trunk/Tools/ChangeLog 2013-11-22 04:05:13 UTC (rev 159674)
+++ trunk/Tools/ChangeLog 2013-11-22 04:17:22 UTC (rev 159675)
@@ -1,3 +1,23 @@
+2013-11-21 Peter Szanka <[email protected]>
+
+ Remove chrome/chromium related things from webkitpy.
+ https://bugs.webkit.org/show_bug.cgi?id=124493
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ (PortTest.assert_mock_port_works):
+ * Scripts/webkitpy/port/base.py:
+ (Port.to.setup_environ_for_server):
+ * Scripts/webkitpy/port/mac_unittest.py:
+ (test_tests_for_other_platforms):
+ * Scripts/webkitpy/port/mock_drt.py:
+ (MockTestShell.output_for_test):
+ * Scripts/webkitpy/tool/bot/irc_command.py:
+ (Restart.execute):
+ * Scripts/webkitpy/tool/bot/ircbot_unittest.py:
+ (IRCBotTest.test_help):
+
2013-11-21 Dániel Bátyai <[email protected]>
In filereader.py, process_file() should throw instead of exiting directly when the file doesn't exist
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (159674 => 159675)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2013-11-22 04:05:13 UTC (rev 159674)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2013-11-22 04:17:22 UTC (rev 159675)
@@ -919,12 +919,6 @@
def assert_mock_port_works(self, port_name, args=[]):
self.assertTrue(passing_run(args + ['--platform', 'mock-' + port_name, 'fast/harness/results.html'], tests_included=True, host=Host()))
- def disabled_test_chromium_mac_lion(self):
- self.assert_mock_port_works('chromium-mac-lion')
-
- def disabled_test_chromium_mac_lion_in_test_shell_mode(self):
- self.assert_mock_port_works('chromium-mac-lion', args=['--additional-drt-flag=--test-shell'])
-
def disabled_test_mac_lion(self):
self.assert_mock_port_works('mac-lion')
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (159674 => 159675)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2013-11-22 04:05:13 UTC (rev 159674)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2013-11-22 04:17:22 UTC (rev 159675)
@@ -900,8 +900,6 @@
'WEBKIT_TESTFONTS',
'WEBKIT_OUTPUTDIR',
- # Chromium:
- 'CHROME_DEVEL_SANDBOX',
]
for variable in variables_to_copy:
self._copy_value_from_environ_if_set(clean_env, variable)
Modified: trunk/Tools/Scripts/webkitpy/port/mac_unittest.py (159674 => 159675)
--- trunk/Tools/Scripts/webkitpy/port/mac_unittest.py 2013-11-22 04:05:13 UTC (rev 159674)
+++ trunk/Tools/Scripts/webkitpy/port/mac_unittest.py 2013-11-22 04:17:22 UTC (rev 159675)
@@ -80,14 +80,13 @@
self.assertEqual(expected, port.name())
def test_tests_for_other_platforms(self):
- platforms = ['mac', 'chromium-linux', 'mac-snowleopard']
+ platforms = ['mac', 'mac-snowleopard']
port = self.make_port(port_name='mac-snowleopard')
platform_dir_paths = map(port._webkit_baseline_path, platforms)
# Replace our empty mock file system with one which has our expected platform directories.
port._filesystem = MockFileSystem(dirs=platform_dir_paths)
dirs_to_skip = port._tests_for_other_platforms()
- self.assertIn('platform/chromium-linux', dirs_to_skip)
self.assertNotIn('platform/mac', dirs_to_skip)
self.assertNotIn('platform/mac-snowleopard', dirs_to_skip)
Modified: trunk/Tools/Scripts/webkitpy/port/mock_drt.py (159674 => 159675)
--- trunk/Tools/Scripts/webkitpy/port/mock_drt.py 2013-11-22 04:05:13 UTC (rev 159674)
+++ trunk/Tools/Scripts/webkitpy/port/mock_drt.py 2013-11-22 04:17:22 UTC (rev 159675)
@@ -271,8 +271,6 @@
def output_for_test(self, test_input, is_reftest):
# FIXME: This is a hack to make virtual tests work. Need something more general.
original_test_name = test_input.test_name
- if '--enable-accelerated-2d-canvas' in self._args and 'canvas' in test_input.test_name:
- test_input.test_name = 'platform/chromium/virtual/gpu/' + test_input.test_name
output = super(MockTestShell, self).output_for_test(test_input, is_reftest)
test_input.test_name = original_test_name
return output
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py (159674 => 159675)
--- trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2013-11-22 04:05:13 UTC (rev 159674)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py 2013-11-22 04:17:22 UTC (rev 159675)
@@ -147,20 +147,6 @@
tool.irc().post("Restarting...")
raise TerminateQueue()
-
-class RollChromiumDEPS(IRCCommand):
- usage_string = "roll-chromium-deps REVISION"
- help_string = "Rolls WebKit's Chromium DEPS to the given revision???"
-
- def execute(self, nick, args, tool, sheriff):
- if not len(args):
- return self.usage(nick)
- tool.irc().post("%s: Will roll Chromium DEPS to %s" % (nick, ' '.join(args)))
- tool.irc().post("%s: Rolling Chromium DEPS to %s" % (nick, ' '.join(args)))
- tool.irc().post("%s: Rolled Chromium DEPS to %s" % (nick, ' '.join(args)))
- tool.irc().post("%s: Thank You" % nick)
-
-
class Rollout(IRCCommand):
usage_string = "rollout SVN_REVISION [SVN_REVISIONS] REASON"
help_string = "Opens a rollout bug, CCing author + reviewer, and attaching the reverse-diff of the given revisions marked as commit-queue=?."
@@ -305,7 +291,6 @@
"hi": Hi,
"ping": PingPong,
"restart": Restart,
- "roll-chromium-deps": RollChromiumDEPS,
"rollout": Rollout,
"whois": Whois,
"yt?": YouThere,
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py (159674 => 159675)
--- trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py 2013-11-22 04:05:13 UTC (rev 159674)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/ircbot_unittest.py 2013-11-22 04:17:22 UTC (rev 159675)
@@ -88,7 +88,7 @@
OutputCapture().assert_outputs(self, run, args=["hi"], expected_logs=expected_logs)
def test_help(self):
- expected_logs = 'MOCK: irc.post: mock_nick: Available commands: create-bug, help, hi, ping, restart, roll-chromium-deps, rollout, whois, yt?\nMOCK: irc.post: mock_nick: Type "mock-sheriff-bot: help COMMAND" for help on my individual commands.\n'
+ expected_logs = 'MOCK: irc.post: mock_nick: Available commands: create-bug, help, hi, ping, restart, rollout, whois, yt?\nMOCK: irc.post: mock_nick: Type "mock-sheriff-bot: help COMMAND" for help on my individual commands.\n'
OutputCapture().assert_outputs(self, run, args=["help"], expected_logs=expected_logs)
expected_logs = 'MOCK: irc.post: mock_nick: Usage: hi\nMOCK: irc.post: mock_nick: Responds with hi.\nMOCK: irc.post: mock_nick: Aliases: hello\n'
OutputCapture().assert_outputs(self, run, args=["help hi"], expected_logs=expected_logs)
