Skip to content
Permalink
Browse files
2010-10-19 Kenneth Russell <kbr@google.com>
        Reviewed by David Levin.

        chromium_gpu port of new-run-webkit-tests must search chromium-gpu directory for expectations
        https://bugs.webkit.org/show_bug.cgi?id=47874

        * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
        * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:


Canonical link: https://commits.webkit.org/60630@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@70068 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
kenrussell committed Oct 19, 2010
1 parent c6d8ad5 commit 884815b3a565dd5e0db1990c6e67a7415558d6a8
Showing 3 changed files with 18 additions and 7 deletions.
@@ -1,3 +1,13 @@
2010-10-19 Kenneth Russell <kbr@google.com>

Reviewed by David Levin.

chromium_gpu port of new-run-webkit-tests must search chromium-gpu directory for expectations
https://bugs.webkit.org/show_bug.cgi?id=47874

* Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
* Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:

2010-10-19 Tony Chang <tony@chromium.org>

Reviewed by Kent Tamura.
@@ -90,7 +90,7 @@ def __init__(self, **kwargs):
chromium_linux.ChromiumLinuxPort.__init__(self, **kwargs)

def baseline_search_path(self):
return ([self._webkit_baseline_path('chromium-gpu-linux')] +
return (map(self._webkit_baseline_path, ['chromium-gpu-linux', 'chromium-gpu']) +
chromium_linux.ChromiumLinuxPort.baseline_search_path(self))

def path_to_test_expectations_file(self):
@@ -108,7 +108,7 @@ def __init__(self, **kwargs):
chromium_mac.ChromiumMacPort.__init__(self, **kwargs)

def baseline_search_path(self):
return ([self._webkit_baseline_path('chromium-gpu-mac')] +
return (map(self._webkit_baseline_path, ['chromium-gpu-mac', 'chromium-gpu']) +
chromium_mac.ChromiumMacPort.baseline_search_path(self))

def path_to_test_expectations_file(self):
@@ -126,7 +126,7 @@ def __init__(self, **kwargs):
chromium_win.ChromiumWinPort.__init__(self, **kwargs)

def baseline_search_path(self):
return ([self._webkit_baseline_path('chromium-gpu-win')] +
return (map(self._webkit_baseline_path, ['chromium-gpu-win', 'chromium-gpu']) +
chromium_win.ChromiumWinPort.baseline_search_path(self))

def path_to_test_expectations_file(self):
@@ -52,11 +52,12 @@ def assertOverridesWorked(self, port_name):
# we use startswith() instead of Equal to gloss over platform versions.
self.assertTrue(port.name().startswith(port_name))

# test that it has the right directory in front of the search path.
path = port.baseline_search_path()[0]
self.assertEqual(port._webkit_baseline_path(port_name), path)
# test that it has the right directories in front of the search path.
paths = port.baseline_search_path()
self.assertEqual(port._webkit_baseline_path(port_name), paths[0])
self.assertEqual(port._webkit_baseline_path('chromium-gpu'), paths[1])

# test that we have the right expectations file.
# Test that we have the right expectations file.
self.assertTrue('chromium-gpu' in
port.path_to_test_expectations_file())

0 comments on commit 884815b

Please sign in to comment.