Changeset 70068 in webkit


Ignore:
Timestamp:
Oct 19, 2010 10:56:44 AM (13 years ago)
Author:
kbr@google.com
Message:

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:
Location:
trunk/WebKitTools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r70064 r70068  
     12010-10-19  Kenneth Russell  <kbr@google.com>
     2
     3        Reviewed by David Levin.
     4
     5        chromium_gpu port of new-run-webkit-tests must search chromium-gpu directory for expectations
     6        https://bugs.webkit.org/show_bug.cgi?id=47874
     7
     8        * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
     9        * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
     10
    1112010-10-19  Tony Chang  <tony@chromium.org>
    212
  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py

    r69250 r70068  
    9191
    9292    def baseline_search_path(self):
    93         return ([self._webkit_baseline_path('chromium-gpu-linux')] +
     93        return (map(self._webkit_baseline_path, ['chromium-gpu-linux', 'chromium-gpu']) +
    9494                chromium_linux.ChromiumLinuxPort.baseline_search_path(self))
    9595
     
    109109
    110110    def baseline_search_path(self):
    111         return ([self._webkit_baseline_path('chromium-gpu-mac')] +
     111        return (map(self._webkit_baseline_path, ['chromium-gpu-mac', 'chromium-gpu']) +
    112112                chromium_mac.ChromiumMacPort.baseline_search_path(self))
    113113
     
    127127
    128128    def baseline_search_path(self):
    129         return ([self._webkit_baseline_path('chromium-gpu-win')] +
     129        return (map(self._webkit_baseline_path, ['chromium-gpu-win', 'chromium-gpu']) +
    130130                chromium_win.ChromiumWinPort.baseline_search_path(self))
    131131
  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py

    r70013 r70068  
    5353        self.assertTrue(port.name().startswith(port_name))
    5454
    55         # test that it has the right directory in front of the search path.
    56         path = port.baseline_search_path()[0]
    57         self.assertEqual(port._webkit_baseline_path(port_name), path)
     55        # test that it has the right directories in front of the search path.
     56        paths = port.baseline_search_path()
     57        self.assertEqual(port._webkit_baseline_path(port_name), paths[0])
     58        self.assertEqual(port._webkit_baseline_path('chromium-gpu'), paths[1])
    5859
    59         # test that we have the right expectations file.
     60        # Test that we have the right expectations file.
    6061        self.assertTrue('chromium-gpu' in
    6162                        port.path_to_test_expectations_file())
Note: See TracChangeset for help on using the changeset viewer.