From db14019a23d96bc8a444b6576a5da8bd1cfbc8b0 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 4 Aug 2010 11:41:34 +0100 Subject: Merge WebKit at r64523 : Initial merge by git. Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4 --- WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'WebKitTools/Scripts/webkitpy/layout_tests/port') diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py index f8b181c..6cfc0b8 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py @@ -47,8 +47,8 @@ import http_server from webkitpy.common.system.executive import Executive -# Chromium DRT on non-Windows uses WebKitDriver. -if sys.platform not in ('win32', 'cygwin'): +# Chromium DRT on OSX uses WebKitDriver. +if sys.platform == 'darwin': import webkit import websocket_server @@ -172,7 +172,7 @@ class ChromiumPort(base.Port): def create_driver(self, image_path, options): """Starts a new Driver and returns a handle to it.""" - if self._options.use_drt and sys.platform not in ('win32', 'cygwin'): + if self._options.use_drt and sys.platform == 'darwin': return webkit.WebKitDriver(self, image_path, options, executive=self._executive) if self._options.use_drt: options += ['--test-shell'] -- cgit v1.1