Changeset 56366 in webkit

Timestamp:

Mar 22, 2010 4:04:00 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-03-22 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Dimitri Glazkov.

Change baseline_path() to point to the upstream locations for the
Chromium ports. Also change the reabselining scripts to use the
correct functions to get the baseline directories, and fix the
script's sys.path to pull in simplejson correctly.

​https://bugs.webkit.org/show_bug.cgi?id=36417

• Scripts/rebaseline-chromium-webkit-tests:
  • fix sys.path to pick up simplejson properly
• Scripts/webkitpy/layout_tests/port/chromium.py:
  • change baseline_path() to use webkit_baseline_path()
  • error out correctly if we can't find the chromium base dir
• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
  • call baseline_path(), not chromium_baseline_path()

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/rebaseline-chromium-webkit-tests (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-22  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Change baseline_path() to point to the upstream locations for the
+        Chromium ports. Also change the reabselining scripts to use the
+        correct functions to get the baseline directories, and fix the
+        script's sys.path to pull in simplejson correctly.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36417
+
+        * Scripts/rebaseline-chromium-webkit-tests:
+          - fix sys.path to pick up simplejson properly
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+          - change baseline_path() to use webkit_baseline_path()
+          - error out correctly if we can't find the chromium base dir
+        * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
+          - call baseline_path(), not chromium_baseline_path()
+
 2010-03-22  Chris Jerdonek  <cjerdonek@webkit.org>
 

trunk/WebKitTools/Scripts/rebaseline-chromium-webkit-tests

@@ -32 +32 @@
 import sys
 
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])),
-                             "webkitpy", "layout_tests"))
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0]))))
+scripts_directory = os.path.dirname(os.path.abspath(sys.argv[0]))
+webkitpy_directory = os.path.join(scripts_directory, "webkitpy")
+sys.path.append(os.path.join(webkitpy_directory, "layout_tests"))
+
+# For simplejson
+sys.path.append(os.path.join(webkitpy_directory, "thirdparty"))
 
 import rebaseline_chromium_webkit_tests

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -70 +70 @@
 
     def baseline_path(self):
-        return self._chromium_baseline_path(self._name)
+        return self._webkit_baseline_path(self._name)
 
     def check_build(self, needs_http):
@@ -111 +111 @@
         if not self._chromium_base_dir:
             abspath = os.path.abspath(__file__)
-            self._chromium_base_dir = abspath[0:abspath.find('third_party')]
+            offset = abspath.find('third_party')
+            if offset == -1:
+                raise AssertionError('could not find Chromium base dir from ' +
+                                     abspath)
+            self._chromium_base_dir = abspath[0:offset]
         return os.path.join(self._chromium_base_dir, *comps)
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py

@@ -205 +205 @@
 
     def __init__(self, running_port, platform, options):
-        self._file_dir = running_port.path_from_chromium_base(
-            'webkit', 'tools', 'layout_tests')
         self._platform = platform
         self._options = options
@@ -442 +440 @@
                 expected_filename = '%s-expected%s' % (test_basename, suffix)
                 expected_fullpath = os.path.join(
-                    self._port._chromium_baseline_path(platform),
-                    expected_filename)
+                    self._port.baseline_path(platform), expected_filename)
                 expected_fullpath = os.path.normpath(expected_fullpath)
                 _log.debug('  Expected file full path: "%s"',