[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
dpranke at chromium.org
dpranke at chromium.org
Thu Apr 8 02:21:25 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit d5415dfd276c2456cf132e99639020c96b1164c3
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Mar 12 22:43:00 2010 +0000
2010-03-12 Dirk Pranke <dpranke at chromium.org>
Reviewed by Adam Barth.
new-run-webkit-tests --new-baseline doesn't work at all.
It attempts to call a method that isn't defined. To fix it, I
removed the unnecessary and unnecessarily confusing 'platform'
argument to the test_type constructor and use the Port object that
is passed in instead, since we are only ever generating a baseline
from the port that is currently executing.
https://bugs.webkit.org/show_bug.cgi?id=36046
* Scripts/webkitpy/layout_tests/port/mac.py:
* Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
* Scripts/webkitpy/layout_tests/test_types/test_type_base.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55938 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 158f848..1e9d206 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,25 @@
Reviewed by Adam Barth.
+ new-run-webkit-tests --new-baseline doesn't work at all.
+
+ It attempts to call a method that isn't defined. To fix it, I
+ removed the unnecessary and unnecessarily confusing 'platform'
+ argument to the test_type constructor and use the Port object that
+ is passed in instead, since we are only ever generating a baseline
+ from the port that is currently executing.
+
+ https://bugs.webkit.org/show_bug.cgi?id=36046
+
+ * Scripts/webkitpy/layout_tests/port/mac.py:
+ * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ * Scripts/webkitpy/layout_tests/test_types/test_type_base.py:
+
+2010-03-12 Dirk Pranke <dpranke at chromium.org>
+
+ Reviewed by Adam Barth.
+
Fix new-run-webkit-tests --run-singly
This script option is currently broken - the script attempts to
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
index fbba4a8..ae41992 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
@@ -58,6 +58,9 @@ class MacPort(base.Port):
base.Port.__init__(self, port_name, options)
self._cached_build_root = None
+ def baseline_path(self):
+ return self._webkit_baseline_path(self._name)
+
def baseline_search_path(self):
dirs = []
if self._name == 'mac-tiger':
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
index 962bf38..93b2f02 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
@@ -544,10 +544,10 @@ class Rebaseliner(object):
return True
if ext1 == '.PNG':
- return image_diff.ImageDiff(self._port, self._platform,
- '').diff_files(self._port, file1, file2)
+ return image_diff.ImageDiff(self._port,
+ '').diff_files(self._port, file1, file2)
else:
- return text_diff.TestTextDiff(self._port, self._platform,
+ return text_diff.TestTextDiff(self._port,
'').diff_files(self._port, file1, file2)
def _delete_baseline(self, filename):
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index 5ec0ec5..b809770 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -516,7 +516,7 @@ class TestRunner:
# Create separate TestTypes instances for each thread.
test_types = []
for t in self._test_types:
- test_types.append(t(self._port, self._options.platform,
+ test_types.append(t(self._port,
self._options.results_directory))
test_args, png_path, shell_args = self._get_test_shell_args(i)
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py b/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py
index 60f50a3..dbd6278 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py
@@ -72,17 +72,15 @@ class TestTypeBase(object):
FILENAME_SUFFIX_WDIFF = "-wdiff.html"
FILENAME_SUFFIX_COMPARE = "-diff.png"
- def __init__(self, port, platform, root_output_dir):
+ def __init__(self, port, root_output_dir):
"""Initialize a TestTypeBase object.
Args:
- platform: the platform (e.g., 'chromium-mac-leopard')
- identifying the platform-specific results to be used.
+ port: object implementing port-specific information and methods
root_output_dir: The unix style path to the output dir.
"""
self._root_output_dir = root_output_dir
self._port = port
- self._platform = platform
def _make_output_directory(self, filename):
"""Creates the output directory (if needed) for a given test
@@ -92,7 +90,7 @@ class TestTypeBase(object):
self._port.maybe_make_directory(os.path.split(output_filename)[0])
def _save_baseline_data(self, filename, data, modifier):
- """Saves a new baseline file into the platform directory.
+ """Saves a new baseline file into the port's baseline directory.
The file will be named simply "<test>-expected<modifier>", suitable for
use as the expected results in a later run.
@@ -104,8 +102,9 @@ class TestTypeBase(object):
"""
relative_dir = os.path.dirname(
self._port.relative_test_filename(filename))
- output_dir = os.path.join(
- self._port.chromium_baseline_path(self._platform), relative_dir)
+
+ baseline_path = self._port.baseline_path()
+ output_dir = os.path.join(baseline_path, relative_dir)
output_file = os.path.basename(os.path.splitext(filename)[0] +
self.FILENAME_SUFFIX_EXPECTED + modifier)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list