[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 18:42:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ba66cb753833bc1eafa2b090e021a794188cd7a3
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 16 00:58:08 2010 +0000
2010-12-15 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r74136.
http://trac.webkit.org/changeset/74136
https://bugs.webkit.org/show_bug.cgi?id=51135
r74136 breaks chromium canary bots because some tests are not
rebaselined correctly to resolve EOL differences (Requested by
jianli on #webkit).
* Scripts/webkitpy/layout_tests/port/base.py:
* Scripts/webkitpy/layout_tests/port/test.py:
* Scripts/webkitpy/layout_tests/test_types/text_diff.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74163 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e8aa202..ce2c787 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-15 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r74136.
+ http://trac.webkit.org/changeset/74136
+ https://bugs.webkit.org/show_bug.cgi?id=51135
+
+ r74136 breaks chromium canary bots because some tests are not
+ rebaselined correctly to resolve EOL differences (Requested by
+ jianli on #webkit).
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ * Scripts/webkitpy/layout_tests/port/test.py:
+ * Scripts/webkitpy/layout_tests/test_types/text_diff.py:
+
2010-12-15 Adam Roben <aroben at apple.com>
Teach check-webkit-style to check .vcproj and .vsprops files for XML
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
index aa8b2e5..bc5a9aa 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
@@ -322,8 +322,7 @@ class Port(object):
return self._filesystem.read_binary_file(path)
def expected_text(self, test):
- """Returns the text output we expect the test to produce.
- End-of-line characters are normalized to '\n'."""
+ """Returns the text output we expect the test to produce."""
# FIXME: DRT output is actually utf-8, but since we don't decode the
# output from DRT (instead treating it as a binary string), we read the
# baselines as a binary string, too.
@@ -331,7 +330,7 @@ class Port(object):
if not self.path_exists(path):
return ''
text = self._filesystem.read_binary_file(path)
- return text.replace("\r\n", "\n")
+ return text.strip("\r\n").replace("\r\n", "\n") + "\n"
def filename_to_uri(self, filename):
"""Convert a test file (which is an absolute path) to a URI."""
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py
index f70b6d3..9e79667 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py
@@ -90,6 +90,8 @@ class TestPort(base.Port):
def __init__(self, **kwargs):
base.Port.__init__(self, **kwargs)
tests = TestList(self)
+ tests.add('passes/image.html')
+ tests.add('passes/text.html')
tests.add('failures/expected/checksum.html',
actual_checksum='checksum_fail-checksum')
tests.add('failures/expected/crash.html', crash=True)
@@ -112,15 +114,6 @@ class TestPort(base.Port):
expected_image=None)
tests.add('failures/expected/missing_text.html',
expected_text=None)
- tests.add('failures/expected/newlines_leading.html',
- expected_text="\nfoo\n",
- actual_text="foo\n")
- tests.add('failures/expected/newlines_trailing.html',
- expected_text="foo\n\n",
- actual_text="foo\n")
- tests.add('failures/expected/newlines_with_excess_CR.html',
- expected_text="foo\r\r\r\n",
- actual_text="foo\n")
tests.add('failures/expected/text.html',
actual_text='text_fail-png')
tests.add('failures/unexpected/text-image-checksum.html',
@@ -131,11 +124,7 @@ class TestPort(base.Port):
tests.add('passes/error.html', error='stuff going to stderr')
tests.add('passes/image.html')
tests.add('passes/platform_image.html')
- # Text output files contain "\r\n" on Windows. This may be
- # helpfully filtered to "\r\r\n" by our Python/Cygwin tooling.
- tests.add('passes/text.html',
- expected_text='\nfoo\n\n',
- actual_text='\nfoo\r\n\r\r\n')
+ tests.add('passes/text.html')
tests.add('websocket/tests/passes/text.html')
self._tests = tests
@@ -281,9 +270,6 @@ WONTFIX : failures/expected/image_checksum.html = IMAGE
WONTFIX : failures/expected/missing_check.html = MISSING PASS
WONTFIX : failures/expected/missing_image.html = MISSING PASS
WONTFIX : failures/expected/missing_text.html = MISSING PASS
-WONTFIX : failures/expected/newlines_leading.html = TEXT
-WONTFIX : failures/expected/newlines_trailing.html = TEXT
-WONTFIX : failures/expected/newlines_with_excess_CR.html = TEXT
WONTFIX : failures/expected/text.html = TEXT
WONTFIX : failures/expected/timeout.html = TIMEOUT
WONTFIX SKIP : failures/expected/hang.html = TIMEOUT
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/test_types/text_diff.py b/WebKitTools/Scripts/webkitpy/layout_tests/test_types/text_diff.py
index ad25262..ca4b17d 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/test_types/text_diff.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/test_types/text_diff.py
@@ -49,13 +49,11 @@ _log = logging.getLogger("webkitpy.layout_tests.test_types.text_diff")
class TestTextDiff(test_type_base.TestTypeBase):
def _get_normalized_output_text(self, output):
- """Returns the normalized text output, i.e. the output in which
- the end-of-line characters are normalized to "\n"."""
- # Running tests on Windows produces "\r\n". The "\n" part is helpfully
- # changed to "\r\n" by our system (Python/Cygwin), resulting in
- # "\r\r\n", when, in fact, we wanted to compare the text output with
- # the normalized text expectation files.
- return output.replace("\r\r\n", "\r\n").replace("\r\n", "\n")
+ # Some tests produce "\r\n" explicitly. Our system (Python/Cygwin)
+ # helpfully changes the "\n" to "\r\n", resulting in "\r\r\n".
+ norm = output.replace("\r\r\n", "\r\n").strip("\r\n").replace(
+ "\r\n", "\n")
+ return norm + "\n"
def compare_output(self, port, filename, test_args, actual_test_output,
expected_test_output):
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list