Commit 880eca66 authored by dpranke@chromium.org's avatar dpranke@chromium.org

nrwt: --additional-platform-dir is broken on chromium ports

https://bugs.webkit.org/show_bug.cgi?id=96840

Reviewed by Ojan Vafai.

Looks like I broke this when cleaning things up as part of
adding ML support. Fixing and adding a test.

* Scripts/webkitpy/layout_tests/port/chromium.py:
(ChromiumPort.default_baseline_search_path):
* Scripts/webkitpy/layout_tests/port/chromium_android.py:
(ChromiumAndroidPort.default_baseline_search_path):
* Scripts/webkitpy/layout_tests/port/chromium_linux.py:
(ChromiumLinuxPort.default_baseline_search_path):
* Scripts/webkitpy/layout_tests/port/chromium_mac.py:
(ChromiumMacPort.__init__):
* Scripts/webkitpy/layout_tests/port/chromium_win.py:
(ChromiumWinPort.setup_environ_for_server):
* Scripts/webkitpy/layout_tests/port/port_testcase.py:
(test_check_build):
(test_additional_platform_directory):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@128675 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent bd1cfeab
2012-09-14 Dirk Pranke <dpranke@chromium.org>
nrwt: --additional-platform-dir is broken on chromium ports
https://bugs.webkit.org/show_bug.cgi?id=96840
Reviewed by Ojan Vafai.
Looks like I broke this when cleaning things up as part of
adding ML support. Fixing and adding a test.
* Scripts/webkitpy/layout_tests/port/chromium.py:
(ChromiumPort.default_baseline_search_path):
* Scripts/webkitpy/layout_tests/port/chromium_android.py:
(ChromiumAndroidPort.default_baseline_search_path):
* Scripts/webkitpy/layout_tests/port/chromium_linux.py:
(ChromiumLinuxPort.default_baseline_search_path):
* Scripts/webkitpy/layout_tests/port/chromium_mac.py:
(ChromiumMacPort.__init__):
* Scripts/webkitpy/layout_tests/port/chromium_win.py:
(ChromiumWinPort.setup_environ_for_server):
* Scripts/webkitpy/layout_tests/port/port_testcase.py:
(test_check_build):
(test_additional_platform_directory):
2012-09-13 Stephanie Lewis <slewis@apple.com>
mac-future ignores previous platform TestExpectations.
......
......@@ -114,6 +114,9 @@ class ChromiumPort(Port):
def default_pixel_tests(self):
return True
def default_baseline_search_path(self):
return map(self._webkit_baseline_path, self.FALLBACK_PATHS[self.version()])
def default_timeout_ms(self):
if self.get_option('configuration') == 'Debug':
return 12 * 1000
......
......@@ -187,7 +187,7 @@ class ChromiumAndroidPort(chromium.ChromiumPort):
def default_child_processes(self):
return len(self._get_devices())
def baseline_search_path(self):
def default_baseline_search_path(self):
return map(self._webkit_baseline_path, self.FALLBACK_PATHS)
def check_wdiff(self, logging=True):
......
......@@ -106,7 +106,7 @@ class ChromiumLinuxPort(chromium.ChromiumPort):
self._version = 'lucid' # We only support lucid right now.
self._architecture = arch
def baseline_search_path(self):
def default_baseline_search_path(self):
port_names = self.FALLBACK_PATHS[self._architecture]
return map(self._webkit_baseline_path, port_names)
......
......@@ -79,10 +79,6 @@ class ChromiumMacPort(chromium.ChromiumPort):
self._version = port_name[port_name.index('chromium-mac-') + len('chromium-mac-'):]
assert self._version in self.SUPPORTED_OS_VERSIONS
def baseline_search_path(self):
fallback_paths = self.FALLBACK_PATHS
return map(self._webkit_baseline_path, fallback_paths[self._version])
def _modules_to_search_for_symbols(self):
return [self._build_path('ffmpegsumo.so')]
......
......@@ -99,10 +99,6 @@ class ChromiumWinPort(chromium.ChromiumPort):
self._executive.run_command([setup_mount]) # Paths are all absolute, so this does not require a cwd.
return env
def baseline_search_path(self):
port_names = self.FALLBACK_PATHS[self.version()]
return map(self._webkit_baseline_path, port_names)
def _modules_to_search_for_symbols(self):
# FIXME: we should return the path to the ffmpeg equivalents to detect if we have the mp3 and aac codecs installed.
# See https://bugs.webkit.org/show_bug.cgi?id=89706.
......
......@@ -609,3 +609,7 @@ class PortTestCase(unittest.TestCase):
port._build_driver = build_driver_called
port.check_build(False)
self.assertFalse(self.build_called, None)
def test_additional_platform_directory(self):
port = self.make_port(options=MockOptions(additional_platform_directory=['/tmp/foo']))
self.assertEquals(port.baseline_search_path()[0], '/tmp/foo')
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment