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

webkit/tools/layout_tests/layout_package/platform_utils_linux.py

Index: webkit/tools/layout_tests/layout_package/platform_utils_linux.py
===================================================================
--- webkit/tools/layout_tests/layout_package/platform_utils_linux.py	(revision 12853)
+++ webkit/tools/layout_tests/layout_package/platform_utils_linux.py	(working copy)
@@ -161,7 +161,8 @@
 
   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 @@
     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."""