Fix failures in test-webkitpy caused by r105177.

Unreviewed, build fix.

* Scripts/webkitpy/layout_tests/port/chromium_linux.py:
(ChromiumLinuxPort._determine_driver_path_statically):
(ChromiumLinuxPort._static_build_path):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105195 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index bc2dad4..96a2613 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,15 @@
 2012-01-17  Dirk Pranke  <dpranke@chromium.org>
 
+        Fix failures in test-webkitpy caused by r105177.
+
+        Unreviewed, build fix.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
+        (ChromiumLinuxPort._determine_driver_path_statically):
+        (ChromiumLinuxPort._static_build_path):
+
+2012-01-17  Dirk Pranke  <dpranke@chromium.org>
+
         webkitpy: make PortFactory.get() be fully data-driven
         https://bugs.webkit.org/show_bug.cgi?id=76360
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
index cee1eb5..8f600f4 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
@@ -65,7 +65,10 @@ class ChromiumLinuxPort(chromium.ChromiumPort):
         build_directory = getattr(options, 'build_directory', None)
         webkit_base = config_object.path_from_webkit_base()
         chromium_base = cls._chromium_base_dir(host.filesystem)
-        configuration = getattr(options, 'configuration', config_object.default_configuration())
+        if hasattr(options, 'configuration') and options.configuration:
+            configuration = options.configuration
+        else:
+            configuration = config_object.default_configuration()
         return cls._static_build_path(host.filesystem, build_directory, chromium_base, webkit_base, configuration, 'DumpRenderTree')
 
     @staticmethod
@@ -74,7 +77,7 @@ class ChromiumLinuxPort(chromium.ChromiumPort):
             return filesystem.join(build_directory, *comps)
         if filesystem.exists(filesystem.join(chromium_base, 'sconsbuild')):
             return filesystem.join(chromium_base, 'sconsbuild', *comps)
-        if filesystem.exists(filesystem.join(chromium_base, 'out', *comps)):
+        if filesystem.exists(filesystem.join(chromium_base, 'out')):
             return filesystem.join(chromium_base, 'out', *comps)
         if filesystem.exists(filesystem.join(webkit_base, 'sconsbuild')):
             return filesystem.join(webkit_base, 'sconsbuild', *comps)