Changeset 59743 in webkit


Ignore:
Timestamp:
May 18, 2010 10:12:06 PM (14 years ago)
Author:
tony@chromium.org
Message:

2010-05-18 Tony Chang <​tony@chromium.org>

Reviewed by Kent Tamura.

[chromium] new-run-webkit-tests --use-drt should run on Linux
​https://bugs.webkit.org/show_bug.cgi?id=37845

  • Scripts/webkitpy/layout_tests/port/chromium.py:
  • Scripts/webkitpy/layout_tests/port/chromium_linux.py:
  • Scripts/webkitpy/layout_tests/port/chromium_mac.py:
  • Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
  • Scripts/webkitpy/layout_tests/port/chromium_win.py:
Location:
trunk/WebKitTools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r59737 r59743  
     12010-05-18  Tony Chang  <tony@chromium.org>
     2
     3        Reviewed by Kent Tamura.
     4
     5        [chromium] new-run-webkit-tests --use-drt should run on Linux
     6        https://bugs.webkit.org/show_bug.cgi?id=37845
     7
     8        * Scripts/webkitpy/layout_tests/port/chromium.py:
     9        * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
     10        * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
     11        * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
     12        * Scripts/webkitpy/layout_tests/port/chromium_win.py:
     13
    1142010-05-18  Kent Tamura  <tkent@chromium.org>
    215

  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py

    r58503 r59743  
    159159                self._options.configuration, self._options.results_directory)
    160160        except AssertionError:
    161             return self.path_from_webkit_base('WebKit', 'chromium',
    162                 'xcodebuild', self._options.configuration,
    163                 self._options.results_directory)
     161            return self._build_path(self._options.configuration,
     162                                    self._options.results_directory)
    164163
    165164    def setup_test_run(self):
    … …  
    273272            platform = self.name()
    274273        return self.path_from_webkit_base('LayoutTests', 'platform', platform)
     274
     275    def _path_to_image_diff(self):
     276        binary_name = 'image_diff'
     277        if self._options.use_drt:
     278            binary_name = 'ImageDiff'
     279        return self._build_path(self._options.configuration, binary_name)
    275280
    276281

  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py

    r59005 r59743  
    8282
    8383    def _build_path(self, *comps):
    84         base = self.path_from_chromium_base()
     84        if self._options.use_drt:
     85            base = os.path.join(self.path_from_webkit_base(), 'WebKit',
     86                                'chromium')
     87        else:
     88            base = self.path_from_chromium_base()
    8589        if os.path.exists(os.path.join(base, 'sconsbuild')):
    86             return self.path_from_chromium_base('sconsbuild', *comps)
     90            return os.path.join(base, 'sconsbuild', *comps)
    8791        else:
    88             return self.path_from_chromium_base('out', *comps)
     92            return os.path.join(base, 'out', *comps)
    8993
    9094    def _check_apache_install(self):
    … …  
    148152        if not configuration:
    149153            configuration = self._options.configuration
    150         return self._build_path(configuration, 'test_shell')
     154        binary_name = 'test_shell'
     155        if self._options.use_drt:
     156            binary_name = 'DumpRenderTree'
     157        return self._build_path(configuration, binary_name)
    151158
    152159    def _path_to_helper(self):
    153160        return None
    154 
    155     def _path_to_image_diff(self):
    156         return self._build_path(self._options.configuration, 'image_diff')
    157161
    158162    def _path_to_wdiff(self):

  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_mac.py

    r59005 r59743  
    151151        return self._build_path(self._options.configuration, binary_name)
    152152
    153     def _path_to_image_diff(self):
    154         binary_name = 'image_diff'
    155         if self._options.use_drt:
    156             binary_name = 'ImageDiff'
    157         return self._build_path(self._options.configuration, binary_name)
    158 
    159153    def _path_to_wdiff(self):
    160154        return 'wdiff'

  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py

    r58503 r59743  
    2828
    2929import chromium
     30import chromium_linux
     31import chromium_mac
     32import chromium_win
    3033import unittest
    3134import StringIO
    … …  
    7982        self.driver._proc.stdout.readline = mock_readline
    8083        self._assert_write_command_and_read_line(expected_crash=True)
     84
     85    def test_path_to_image_diff(self):
     86        class MockOptions:
     87            def __init__(self):
     88                self.use_drt = True
     89
     90        port = chromium_linux.ChromiumLinuxPort('test-port', options=MockOptions())
     91        self.assertTrue(port._path_to_image_diff().endswith(
     92            '/out/Release/ImageDiff'))
     93        port = chromium_mac.ChromiumMacPort('test-port', options=MockOptions())
     94        self.assertTrue(port._path_to_image_diff().endswith(
     95            '/xcodebuild/Release/ImageDiff'))
     96        # FIXME: Figure out how this is going to work on Windows.
     97        #port = chromium_win.ChromiumWinPort('test-port', options=MockOptions())

  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win.py

    r59661 r59743  
    118118
    119119    def _build_path(self, *comps):
     120        if self._options.use_drt:
     121            return os.path.join(self.path_from_webkit_base(), 'WebKit',
     122                                'chromium', *comps)
    120123        p = self.path_from_chromium_base('webkit', *comps)
    121124        if os.path.exists(p):
Note: See TracChangeset for help on using the changeset viewer.