⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 94031 in webkit


Ignore:
Timestamp:
Aug 29, 2011, 4:39:51 PM (15 years ago)
Author:
abarth@webkit.org
Message:

Add support for chomium-mac (non-CoreGraphics) baselines
​https://bugs.webkit.org/show_bug.cgi?id=67163

Reviewed by Eric Seidel.

This patch teaches the non-CG chromium-mac bots to look at non-CG
baselines. However, the patch still leaves CG as the default set of
baselines.

  • Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py:
  • Scripts/webkitpy/common/config/build.py:
  • Scripts/webkitpy/common/config/build_unittest.py:
  • Scripts/webkitpy/layout_tests/port/builders.py:
  • Scripts/webkitpy/layout_tests/port/chromium.py:
  • Scripts/webkitpy/layout_tests/port/chromium_mac.py:
  • Scripts/webkitpy/layout_tests/port/factory.py:
  • Scripts/webkitpy/layout_tests/port/factory_unittest.py:
  • Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py:
  • Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py:
  • Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
Location:
trunk/Tools
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r94008 r94031  
     12011-08-29  Adam Barth  <abarth@webkit.org>
     2
     3        Add support for chomium-mac (non-CoreGraphics) baselines
     4        https://bugs.webkit.org/show_bug.cgi?id=67163
     5
     6        Reviewed by Eric Seidel.
     7
     8        This patch teaches the non-CG chromium-mac bots to look at non-CG
     9        baselines.  However, the patch still leaves CG as the default set of
     10        baselines.
     11
     12        * Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py:
     13        * Scripts/webkitpy/common/config/build.py:
     14        * Scripts/webkitpy/common/config/build_unittest.py:
     15        * Scripts/webkitpy/layout_tests/port/builders.py:
     16        * Scripts/webkitpy/layout_tests/port/chromium.py:
     17        * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
     18        * Scripts/webkitpy/layout_tests/port/factory.py:
     19        * Scripts/webkitpy/layout_tests/port/factory_unittest.py:
     20        * Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py:
     21        * Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py:
     22        * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
     23
    1242011-08-29  Shawn Singh  <shawnsingh@chromium.org>
    225

  • trunk/Tools/Scripts/webkitpy/common/checkout/baselineoptimizer_unittest.py

    r93166 r94031  
    124124            'LayoutTests': '9c876f8c3e4cc2aef9519a6c1174eb3432591127',
    125125            'LayoutTests/platform/chromium-cg-mac': '23a30302a6910f8a48b1007fa36f3e3158341834',
     126            'LayoutTests/platform/chromium-mac': '23a30302a6910f8a48b1007fa36f3e3158341834',
    126127        }, {
    127128            'LayoutTests/platform/chromium': '23a30302a6910f8a48b1007fa36f3e3158341834',

  • trunk/Tools/Scripts/webkitpy/common/config/build.py

    r93588 r94031  
    6262        ("LayoutTests/platform/mac", ["mac", "win"]),
    6363        ("cairo", ["gtk", "wincairo"]),
    64         ("cf", ["chromium-cg-mac", "mac", "qt", "win"]),
     64        ("cf", ["chromium-mac", "chromium-cg-mac", "mac", "qt", "win"]),
    6565        ("chromium", ["chromium"]),
    66         ("cocoa", ["chromium-cg-mac", "mac"]),
     66        ("cocoa", ["chromium-mac", "chromium-cg-mac", "mac"]),
    6767        ("curl", ["gtk", "wincairo"]),
    6868        ("gobject", ["gtk"]),
    … …  
    7070        ("gstreamer", ["gtk"]),
    7171        ("gtk", ["gtk"]),
    72         ("mac", ["chromium-cg-mac", "mac"]),
     72        ("mac", ["chromium-mac", "chromium-cg-mac", "mac"]),
    7373        ("mac-leopard", ["mac-leopard"]),
    7474        ("mac-lion", ["mac", "win"]),

  • trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py

    r93166 r94031  
    4949        (["LayoutTests/platform/win/foo"], ["win"]),
    5050        (["Source/WebCore.exp.in", "Source/WebKit/mac/WebKit.exp"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),
    51         (["Source/WebCore/mac/foo"], ["chromium-cg-mac", "mac-leopard", "mac-lion", "mac-snowleopard"]),
     51        (["Source/WebCore/mac/foo"], ["chromium-mac", "chromium-cg-mac", "mac-leopard", "mac-lion", "mac-snowleopard"]),
    5252        (["Source/WebCore/win/foo"], ["chromium-win", "win"]),
    5353        (["Source/WebCore/platform/graphics/gpu/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py

    r93530 r94031  
    4747    "Webkit Linux (dbg)(1)": {"port_name": "chromium-linux-x86_64", "specifiers": set(["linux", "debug"])},
    4848    "Webkit Linux (dbg)(2)": {"port_name": "chromium-linux-x86_64", "specifiers": set(["linux", "debug"])},
     49    "Webkit Mac10.5": {"port_name": "chromium-mac-leopard", "specifiers": set(["leopard"])},
     50    "Webkit Mac10.5 (dbg)(1)": {"port_name": "chromium-mac-leopard", "specifiers": set(["leopard", "debug"])},
     51    "Webkit Mac10.5 (dbg)(2)": {"port_name": "chromium-mac-leopard", "specifiers": set(["leopard", "debug"])},
     52    "Webkit Mac10.6": {"port_name": "chromium-mac-snowleopard", "specifiers": set(["snowleopard"])},
     53    "Webkit Mac10.6 (dbg)": {"port_name": "chromium-mac-snowleopard", "specifiers": set(["snowleopard", "debug"])},
    4954    "Webkit Mac10.5 (CG)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard"])},
    5055    "Webkit Mac10.5 (CG)(dbg)(1)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard", "debug"])},
    … …  
    7883    r"GTK": "gtk",
    7984    r"Qt": "qt",
    80     r"Chromium Mac": "chromium-cg-mac",
     85    r"Chromium Mac": "chromium-mac",
    8186    r"Chromium Linux": "chromium-linux",
    8287    r"Chromium Win": "chromium-win",

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

    r94008 r94031  
    7474
    7575    ALL_BASELINE_VARIANTS = [
     76        'chromium-mac-snowleopard', 'chromium-mac-leopard',
    7677        'chromium-cg-mac-snowleopard', 'chromium-cg-mac-leopard',
    7778        'chromium-win-win7', 'chromium-win-vista', 'chromium-win-xp',

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

    r93166 r94031  
    4848    FALLBACK_PATHS = {
    4949        'leopard': [
     50            'chromium-mac-leopard',
     51            'chromium-mac',
     52            'chromium',
     53            'mac-leopard',
     54            'mac-snowleopard',
     55            'mac',
     56        ],
     57        'snowleopard': [
     58            'chromium-mac',
     59            'chromium',
     60            'mac-snowleopard',
     61            'mac',
     62        ],
     63        'future': [
     64            'chromium-mac',
     65            'chromium',
     66            'mac',
     67        ],
     68    }
     69
     70    FALLBACK_PATHS_CG = {
     71        'leopard': [
    5072            'chromium-cg-mac-leopard',
    5173            'chromium-cg-mac',
    … …  
    7193        # We're a little generic here because this code is reused by the
    7294        # 'google-chrome' port as well as the 'mock-' and 'dryrun-' ports.
    73         port_name = port_name or 'chromium-cg-mac'
     95        port_name = port_name or 'chromium-cg-mac'  # FIXME: Change the default to chromium-mac once we're ready.
    7496        chromium.ChromiumPort.__init__(self, port_name=port_name, **kwargs)
    7597        if port_name.endswith('-mac'):
    … …  
    79101            self._version = port_name[port_name.index('-mac-') + len('-mac-'):]
    80102            assert self._version in self.SUPPORTED_OS_VERSIONS
     103        self._using_core_graphics = port_name.find('-cg-') != -1
    81104        self._operating_system = 'mac'
    82105
    83106    def baseline_search_path(self):
    84         return map(self._webkit_baseline_path, self.FALLBACK_PATHS[self._version])
     107        fallback_paths = self.FALLBACK_PATHS
     108        if self._using_core_graphics:
     109            fallback_paths = self.FALLBACK_PATHS_CG
     110        return map(self._webkit_baseline_path, fallback_paths[self._version])
    85111
    86112    def check_build(self, needs_http):

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py

    r93166 r94031  
    8787            if options and hasattr(options, 'chromium') and options.chromium:
    8888                port_to_use = 'chromium-cg-mac'
     89                # FIXME: Add a way to select the chromium-mac port.
    8990            else:
    9091                port_to_use = 'mac'
    … …  
    117118        import chromium_gpu
    118119        maker = chromium_gpu.get
    119     elif port_to_use.startswith('chromium-cg-mac'):
     120    elif port_to_use.startswith('chromium-mac') or port_to_use.startswith('chromium-cg-mac'):
    120121        import chromium_mac
    121122        maker = chromium_mac.ChromiumMacPort

  • trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py

    r93552 r94031  
    126126
    127127    def test_chromium_mac(self):
     128        self.assert_port("chromium-mac", chromium_mac.ChromiumMacPort)
    128129        self.assert_port("chromium-cg-mac", chromium_mac.ChromiumMacPort)
    129130        self.assert_platform_port("darwin", self.chromium_options,

  • trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py

    r93166 r94031  
    6969    'chromium-win-vista': 'Webkit_Vista',
    7070    'chromium-win-xp': 'Webkit_Win',
    71     'chromium-cg-mac-leopard': 'Webkit_Mac10_5',
    72     'chromium-cg-mac-snowleopard': 'Webkit_Mac10_6',
     71    'chromium-mac-leopard': 'Webkit_Mac10_5',
     72    'chromium-mac-snowleopard': 'Webkit_Mac10_6',
     73    'chromium-cg-mac-leopard': 'Webkit_Mac10_5__CG_',
     74    'chromium-cg-mac-snowleopard': 'Webkit_Mac10_6__CG_',
    7375    'chromium-linux-x86': 'Webkit_Linux_32',
    7476    'chromium-linux-x86_64': 'Webkit_Linux',

  • trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests_unittest.py

    r93166 r94031  
    8585        ARCHIVE_URL + '/Webkit_Mac10_6/': '<a href="4/">',
    8686        ARCHIVE_URL + '/Webkit_Mac10_5/': '<a href="1/"><a href="2/">',
     87        ARCHIVE_URL + '/Webkit_Mac10_6__CG_/': '<a href="4/">',
     88        ARCHIVE_URL + '/Webkit_Mac10_5__CG_/': '<a href="1/"><a href="2/">',
    8789        ARCHIVE_URL + '/Webkit_Win7/': '<a href="1/">',
    8890        ARCHIVE_URL + '/Webkit_Vista/': '<a href="1/">',
    … …  
    104106        },
    105107        ARCHIVE_URL + '/Webkit_Mac10_6/4/layout-test-results.zip': {
     108            'layout-test-results/failures/expected/image-actual.txt': 'new-image-txt',
     109            'layout-test-results/failures/expected/image-actual.checksum': 'new-image-checksum',
     110            'layout-test-results/failures/expected/image-actual.png': 'new-image-png',
     111        },
     112        ARCHIVE_URL + '/Webkit_Mac10_5__CG_/2/layout-test-results.zip': {
     113            'layout-test-results/failures/expected/image-actual.txt': 'new-image-txt',
     114            'layout-test-results/failures/expected/image-actual.checksum': 'new-image-checksum',
     115            'layout-test-results/failures/expected/image-actual.png': 'new-image-png',
     116            'layout-test-results/failures/expected/image_checksum-actual.txt': 'png-comment-txt',
     117            'layout-test-results/failures/expected/image_checksum-actual.checksum': '0123456789',
     118            'layout-test-results/failures/expected/image_checksum-actual.png': 'tEXtchecksum\x000123456789',
     119        },
     120        ARCHIVE_URL + '/Webkit_Mac10_6__CG_/4/layout-test-results.zip': {
    106121            'layout-test-results/failures/expected/image-actual.txt': 'new-image-txt',
    107122            'layout-test-results/failures/expected/image-actual.checksum': 'new-image-checksum',

  • trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

    r93552 r94031  
    6969    userscripts/another-test.html
    7070    userscripts/images.svg
     71Retrieving results for chromium-mac-leopard from Webkit Mac10.5.
     72    userscripts/another-test.html
     73    userscripts/images.svg
     74Retrieving results for chromium-mac-snowleopard from Webkit Mac10.6.
     75    userscripts/another-test.html
     76    userscripts/images.svg
    7177Retrieving results for chromium-win-vista from Webkit Vista.
    7278    userscripts/another-test.html
    … …  
    8995MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux', 'userscripts/another-test.html'], cwd=/mock-checkout
    9096MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux', 'userscripts/images.svg'], cwd=/mock-checkout
     97MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.5', 'userscripts/another-test.html'], cwd=/mock-checkout
     98MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.5', 'userscripts/images.svg'], cwd=/mock-checkout
     99MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.6', 'userscripts/another-test.html'], cwd=/mock-checkout
     100MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.6', 'userscripts/images.svg'], cwd=/mock-checkout
    91101MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Vista', 'userscripts/another-test.html'], cwd=/mock-checkout
    92102MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Vista', 'userscripts/images.svg'], cwd=/mock-checkout
Note: See TracChangeset for help on using the changeset viewer.