From 0170caac6453b9d0a946fea8e22d3e48a82119f1 Mon Sep 17 00:00:00 2001 From: "bradnelson@chromium.org" Date: Fri, 31 Jul 2009 21:23:43 +0000 Subject: Rolling back 22185. BUG=None TEST=None TBR=dpranke Review URL: http://codereview.chromium.org/160477 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22191 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/layout_tests/layout_package/platform_utils_linux.py | 4 ---- webkit/tools/layout_tests/layout_package/platform_utils_mac.py | 1 - webkit/tools/layout_tests/layout_package/platform_utils_win.py | 4 ---- webkit/tools/layout_tests/run_webkit_tests.py | 8 +++++--- 4 files changed, 5 insertions(+), 12 deletions(-) (limited to 'webkit/tools/layout_tests') diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py index 7d06054..b496112 100644 --- a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py +++ b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py @@ -172,10 +172,6 @@ class PlatformUtility(object): """Path to the image_diff binary.""" return PathFromBuildResults(target, 'image_diff') - def LayoutTestHelperPath(self, target): - """Path to the layout_test helper binary, if needed, empty otherwise""" - return '' - def TestShellBinary(self): """The name of the binary for TestShell.""" return 'test_shell' diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_mac.py b/webkit/tools/layout_tests/layout_package/platform_utils_mac.py index 1aa19b0..0a79ba6 100644 --- a/webkit/tools/layout_tests/layout_package/platform_utils_mac.py +++ b/webkit/tools/layout_tests/layout_package/platform_utils_mac.py @@ -158,7 +158,6 @@ class PlatformUtility(object): return PathFromBase('xcodebuild', target, 'image_diff') def LayoutTestHelperBinaryPath(self, target): - """Path to the layout_test helper binary, if needed, empty otherwise""" return PathFromBase('xcodebuild', target, 'layout_test_helper') def TestShellBinary(self): diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_win.py b/webkit/tools/layout_tests/layout_package/platform_utils_win.py index cb5b343..2ba299a 100644 --- a/webkit/tools/layout_tests/layout_package/platform_utils_win.py +++ b/webkit/tools/layout_tests/layout_package/platform_utils_win.py @@ -188,10 +188,6 @@ class PlatformUtility(google.platform_utils_win.PlatformUtility): def ImageCompareExecutablePath(self, target): return PathFromBase('chrome', target, 'image_diff.exe') - def LayoutTestHelperBinaryPath(self, target): - """Path to the layout_test helper binary, if needed, empty otherwise""" - return PathFromBase('chrome', target, 'layout_test_helper.exe') - def TestShellBinary(self): """The name of the binary for TestShell.""" return 'test_shell.exe' diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index 65b719e..a209bdb 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -514,9 +514,11 @@ class TestRunner: # Start up any helper needed layout_test_helper_proc = None - if not options.no_pixel_tests: - helper_path = path_utils.LayoutTestHelperBinaryPath(self._options.target) - if len(helper_path): + if sys.platform in ('darwin'): + # Mac uses a helper for manging the color sync profile for pixel tests. + if not options.no_pixel_tests: + helper_path = \ + path_utils.LayoutTestHelperBinaryPath(self._options.target) logging.info("Starting layout helper %s" % helper_path) layout_test_helper_proc = subprocess.Popen([helper_path], stdin=subprocess.PIPE, -- cgit v1.1