revert the changes in 22303, 22307 for now until I can figure out why

webkit.sln isn't building layout_test_helper

  BUG=none
  R=TBR
  TEST=none


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22312 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 7 insertions, 14 deletions

diff --git a/webkit/tools/layout_tests/layout_package/path_utils.py b/webkit/tools/layout_tests/layout_package/path_utils.py
index b5bfad4..a15048c 100644
--- a/webkit/tools/layout_tests/layout_package/path_utils.py
+++ b/webkit/tools/layout_tests/layout_package/path_utils.py
@@ -217,7 +217,7 @@ def LayoutTestHelperBinaryPath(target):
   platform_util = platform_utils.PlatformUtility('')
   # try output directory from either Xcode or chrome.sln
   full_path = platform_util.LayoutTestHelperBinaryPath(target)
-  if len(full_path) and not os.path.exists(full_path):
+  if not os.path.exists(full_path):
     raise PathNotFound('unable to find layout_test_helper at %s' % full_path)
   return full_path
 
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 888cb20..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 LayoutTestHelperBinaryPath(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 1b09bd2..a209bdb 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -514,16 +514,18 @@ 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,
                                                    stdout=subprocess.PIPE,
                                                    stderr=None)
         is_ready = layout_test_helper_proc.stdout.readline()
-        if not is_ready.startswith('ready'):
+        if is_ready != 'ready\n':
           logging.error("layout_test_helper failed to be ready")
 
     threads = self._InstantiateTestShellThreads(test_shell_binary)