Revert r12849 (conversion of "Hammer" names to "Debug").

Review URL: http://codereview.chromium.org/57051

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

1 files changed, 10 insertions, 2 deletions

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 72aa927..0ea0bec 100644
--- a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py
+++ b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py
@@ -161,7 +161,8 @@ class PlatformUtility(object):
 
   def ImageCompareExecutablePath(self, target):
     """Path to the image_diff binary."""
-    return PathFromBase('sconsbuild', target, 'image_diff')
+    # See mmoss TODO below.
+    return PathFromBase('chrome', 'Hammer', 'image_diff')
 
   def TestShellBinary(self):
     """The name of the binary for TestShell."""
@@ -173,7 +174,14 @@ class PlatformUtility(object):
     Args:
       target: Build target mode (debug or release)
     """
-    return PathFromBase('sconsbuild', target, self.TestShellBinary())
+    # TODO(mmoss) - hard-coded to "Hammer" for now until I look into the scons
+    # output directory logic (and how/if it will change once Linux supports
+    # multiple debug/release targets).
+    try:
+      path = PathFromBase('webkit', 'Hammer', self.TestShellBinary())
+    except google.path_utils.PathNotFound:
+      path = PathFromBase('chrome', 'Hammer', self.TestShellBinary())
+    return path
 
   def FuzzyMatchBinaryPath(self):
     """Return the path to the fuzzy matcher binary."""