From f05b935882198ccf7d81675736e3aeb089c5113a Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 5 May 2011 14:36:32 +0100 Subject: Merge WebKit at r74534: Initial merge by git. Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb --- .../webkitpy/layout_tests/port/google_chrome.py | 122 --------------------- 1 file changed, 122 deletions(-) delete mode 100644 WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome.py (limited to 'WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome.py') diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome.py deleted file mode 100644 index 8d94bb5..0000000 --- a/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome.py +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/env python -# Copyright (C) 2010 Google Inc. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -from __future__ import with_statement - -import codecs -import os - - -def _test_expectations_overrides(port, super): - # The chrome ports use the regular overrides plus anything in the - # official test_expectations as well. Hopefully we don't get collisions. - chromium_overrides = super.test_expectations_overrides(port) - - # FIXME: It used to be that AssertionError would get raised by - # path_from_chromium_base() if we weren't in a Chromium checkout, but - # this changed in r60427. This should probably be changed back. - overrides_path = port.path_from_chromium_base('webkit', 'tools', - 'layout_tests', 'test_expectations_chrome.txt') - if not os.path.exists(overrides_path): - return chromium_overrides - - with codecs.open(overrides_path, "r", "utf-8") as file: - if chromium_overrides: - return chromium_overrides + file.read() - else: - return file.read() - -def GetGoogleChromePort(**kwargs): - """Some tests have slightly different results when compiled as Google - Chrome vs Chromium. In those cases, we prepend an additional directory to - to the baseline paths.""" - port_name = kwargs['port_name'] - del kwargs['port_name'] - if port_name == 'google-chrome-linux32': - import chromium_linux - - class GoogleChromeLinux32Port(chromium_linux.ChromiumLinuxPort): - def baseline_search_path(self): - paths = chromium_linux.ChromiumLinuxPort.baseline_search_path( - self) - paths.insert(0, self._webkit_baseline_path( - 'google-chrome-linux32')) - return paths - - def test_expectations_overrides(self): - return _test_expectations_overrides(self, - chromium_linux.ChromiumLinuxPort) - - return GoogleChromeLinux32Port(**kwargs) - elif port_name == 'google-chrome-linux64': - import chromium_linux - - class GoogleChromeLinux64Port(chromium_linux.ChromiumLinuxPort): - def baseline_search_path(self): - paths = chromium_linux.ChromiumLinuxPort.baseline_search_path( - self) - paths.insert(0, self._webkit_baseline_path( - 'google-chrome-linux64')) - return paths - - def test_expectations_overrides(self): - return _test_expectations_overrides(self, - chromium_linux.ChromiumLinuxPort) - - return GoogleChromeLinux64Port(**kwargs) - elif port_name.startswith('google-chrome-mac'): - import chromium_mac - - class GoogleChromeMacPort(chromium_mac.ChromiumMacPort): - def baseline_search_path(self): - paths = chromium_mac.ChromiumMacPort.baseline_search_path( - self) - paths.insert(0, self._webkit_baseline_path( - 'google-chrome-mac')) - return paths - - def test_expectations_overrides(self): - return _test_expectations_overrides(self, - chromium_mac.ChromiumMacPort) - - return GoogleChromeMacPort(**kwargs) - elif port_name.startswith('google-chrome-win'): - import chromium_win - - class GoogleChromeWinPort(chromium_win.ChromiumWinPort): - def baseline_search_path(self): - paths = chromium_win.ChromiumWinPort.baseline_search_path( - self) - paths.insert(0, self._webkit_baseline_path( - 'google-chrome-win')) - return paths - - def test_expectations_overrides(self): - return _test_expectations_overrides(self, - chromium_win.ChromiumWinPort) - - return GoogleChromeWinPort(**kwargs) - raise NotImplementedError('unsupported port: %s' % port_name) -- cgit v1.1