Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: Ia8a6c2a997232c94108d8937f8c2556f42be1c37
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py
index 786f2c7..0b56ba2 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py
@@ -186,7 +186,7 @@
def command_line_file(self):
return '/data/local/tmp/content-shell-command-line'
def additional_command_line_flags(self):
- return []
+ return ['--dump-render-tree']
def device_directory(self):
return DEVICE_SOURCE_ROOT_DIR + 'content_shell/'
@@ -211,6 +211,11 @@
def pull(self, device_path, host_path, ignore_error=False):
return self.run(['pull', device_path, host_path], ignore_error=ignore_error)
+ def mkdir(self, device_path, chmod=None):
+ self.run(['shell', 'mkdir', '-p', device_path])
+ if chmod:
+ self.run(['shell', 'chmod', chmod, device_path])
+
def restart_as_root(self):
output = self.run(['root'])
if 'adbd is already running as root' in output:
@@ -354,9 +359,11 @@
def additional_drt_flag(self):
# Chromium for Android always uses the hardware GPU path.
- return ['--encode-binary', '--enable-hardware-gpu',
- '--force-compositing-mode',
- '--enable-accelerated-fixed-position']
+ flags = ['--encode-binary', '--enable-hardware-gpu',
+ '--force-compositing-mode',
+ '--enable-accelerated-fixed-position']
+ flags += self._driver_details.additional_command_line_flags()
+ return flags
def default_timeout_ms(self):
# Android platform has less computing power than desktop platforms.
@@ -708,15 +715,14 @@
# Required by webkit_support::GetWebKitRootDirFilePath().
# Other directories will be created automatically by adb push.
- self._android_commands.run(['shell', 'mkdir', '-p', DEVICE_SOURCE_ROOT_DIR + 'chrome'])
+ self._android_commands.mkdir(DEVICE_SOURCE_ROOT_DIR + 'chrome')
- # Allow the test driver to get full read and write access to the directory.
- # The native code needs the permission to write temporary files and create pipes here.
- self._android_commands.run(['shell', 'mkdir', '-p', self._driver_details.device_directory()])
- self._android_commands.run(['shell', 'chmod', '777', self._driver_details.device_directory()])
+ # Allow the test driver to get full read and write access to the directory on the device,
+ # as well as for the FIFOs. We'll need a world writable directory.
+ self._android_commands.mkdir(self._driver_details.device_directory(), chmod='777')
+ self._android_commands.mkdir(self._driver_details.device_fifo_directory(), chmod='777')
- # Delete the disk cache if any to ensure a clean test run.
- # This is like what's done in ChromiumPort.setup_test_run but on the device.
+ # Make sure that the disk cache on the device resets to a clean state.
self._android_commands.run(['shell', 'rm', '-r', self._driver_details.device_cache_directory()])
def _log_error(self, message):
@@ -837,7 +843,7 @@
return self._android_commands.adb_command() + ['shell']
def _android_driver_cmd_line(self, pixel_tests, per_test_args):
- return driver.Driver.cmd_line(self, pixel_tests, per_test_args) + self._driver_details.additional_command_line_flags()
+ return driver.Driver.cmd_line(self, pixel_tests, per_test_args)
@staticmethod
def _loop_with_timeout(condition, timeout_secs):
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/test.py b/Tools/Scripts/webkitpy/layout_tests/port/test.py
index 0c9e946..68922e8 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/test.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/test.py
@@ -351,7 +351,7 @@
ALL_BASELINE_VARIANTS = (
'test-linux-x86_64',
'test-mac-snowleopard', 'test-mac-leopard',
- 'test-win-vista', 'test-win-win7', 'test-win-xp',
+ 'test-win-win7', 'test-win-xp',
)
@classmethod
@@ -376,7 +376,6 @@
version_map = {
'test-win-xp': 'xp',
'test-win-win7': 'win7',
- 'test-win-vista': 'vista',
'test-mac-leopard': 'leopard',
'test-mac-snowleopard': 'snowleopard',
'test-linux-x86_64': 'lucid',
@@ -399,8 +398,7 @@
'test-mac-snowleopard': ['test-mac-snowleopard'],
'test-mac-leopard': ['test-mac-leopard', 'test-mac-snowleopard'],
'test-win-win7': ['test-win-win7'],
- 'test-win-vista': ['test-win-vista', 'test-win-win7'],
- 'test-win-xp': ['test-win-xp', 'test-win-vista', 'test-win-win7'],
+ 'test-win-xp': ['test-win-xp', 'test-win-win7'],
'test-linux-x86_64': ['test-linux-x86_64', 'test-win-win7'],
}
return [self._webkit_baseline_path(d) for d in search_paths[self.name()]]
@@ -517,7 +515,6 @@
return (('leopard', 'x86'),
('snowleopard', 'x86'),
('xp', 'x86'),
- ('vista', 'x86'),
('win7', 'x86'),
('lucid', 'x86'),
('lucid', 'x86_64'))
@@ -527,7 +524,7 @@
def configuration_specifier_macros(self):
"""To avoid surprises when introducing new macros, these are intentionally fixed in time."""
- return {'mac': ['leopard', 'snowleopard'], 'win': ['xp', 'vista', 'win7'], 'linux': ['lucid']}
+ return {'mac': ['leopard', 'snowleopard'], 'win': ['xp', 'win7'], 'linux': ['lucid']}
def all_baseline_variants(self):
return self.ALL_BASELINE_VARIANTS