summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests/run_webkit_tests.py
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools/layout_tests/run_webkit_tests.py')
-rwxr-xr-xwebkit/tools/layout_tests/run_webkit_tests.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index a209bdb..1b09bd2 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -514,18 +514,16 @@ class TestRunner:
# Start up any helper needed
layout_test_helper_proc = None
- 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)
+ if not options.no_pixel_tests:
+ helper_path = path_utils.LayoutTestHelperBinaryPath(self._options.target)
+ if len(helper_path):
logging.info("Starting layout helper %s" % helper_path)
layout_test_helper_proc = subprocess.Popen([helper_path],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=None)
is_ready = layout_test_helper_proc.stdout.readline()
- if is_ready != 'ready\n':
+ if not is_ready.startswith('ready'):
logging.error("layout_test_helper failed to be ready")
threads = self._InstantiateTestShellThreads(test_shell_binary)