Changeset 74163 in webkit
- Timestamp:
- Dec 15, 2010 4:58:08 PM (13 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r74158 r74163 1 2010-12-15 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r74136. 4 http://trac.webkit.org/changeset/74136 5 https://bugs.webkit.org/show_bug.cgi?id=51135 6 7 r74136 breaks chromium canary bots because some tests are not 8 rebaselined correctly to resolve EOL differences (Requested by 9 jianli on #webkit). 10 11 * Scripts/webkitpy/layout_tests/port/base.py: 12 * Scripts/webkitpy/layout_tests/port/test.py: 13 * Scripts/webkitpy/layout_tests/test_types/text_diff.py: 14 1 15 2010-12-15 Adam Roben <aroben@apple.com> 2 16 -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
r74136 r74163 323 323 324 324 def expected_text(self, test): 325 """Returns the text output we expect the test to produce. 326 End-of-line characters are normalized to '\n'.""" 325 """Returns the text output we expect the test to produce.""" 327 326 # FIXME: DRT output is actually utf-8, but since we don't decode the 328 327 # output from DRT (instead treating it as a binary string), we read the … … 332 331 return '' 333 332 text = self._filesystem.read_binary_file(path) 334 return text. replace("\r\n", "\n")333 return text.strip("\r\n").replace("\r\n", "\n") + "\n" 335 334 336 335 def filename_to_uri(self, filename): -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py
r74136 r74163 91 91 base.Port.__init__(self, **kwargs) 92 92 tests = TestList(self) 93 tests.add('passes/image.html') 94 tests.add('passes/text.html') 93 95 tests.add('failures/expected/checksum.html', 94 96 actual_checksum='checksum_fail-checksum') … … 113 115 tests.add('failures/expected/missing_text.html', 114 116 expected_text=None) 115 tests.add('failures/expected/newlines_leading.html',116 expected_text="\nfoo\n",117 actual_text="foo\n")118 tests.add('failures/expected/newlines_trailing.html',119 expected_text="foo\n\n",120 actual_text="foo\n")121 tests.add('failures/expected/newlines_with_excess_CR.html',122 expected_text="foo\r\r\r\n",123 actual_text="foo\n")124 117 tests.add('failures/expected/text.html', 125 118 actual_text='text_fail-png') … … 132 125 tests.add('passes/image.html') 133 126 tests.add('passes/platform_image.html') 134 # Text output files contain "\r\n" on Windows. This may be 135 # helpfully filtered to "\r\r\n" by our Python/Cygwin tooling. 136 tests.add('passes/text.html', 137 expected_text='\nfoo\n\n', 138 actual_text='\nfoo\r\n\r\r\n') 127 tests.add('passes/text.html') 139 128 tests.add('websocket/tests/passes/text.html') 140 129 self._tests = tests … … 282 271 WONTFIX : failures/expected/missing_image.html = MISSING PASS 283 272 WONTFIX : failures/expected/missing_text.html = MISSING PASS 284 WONTFIX : failures/expected/newlines_leading.html = TEXT285 WONTFIX : failures/expected/newlines_trailing.html = TEXT286 WONTFIX : failures/expected/newlines_with_excess_CR.html = TEXT287 273 WONTFIX : failures/expected/text.html = TEXT 288 274 WONTFIX : failures/expected/timeout.html = TIMEOUT -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/test_types/text_diff.py
r74136 r74163 50 50 51 51 def _get_normalized_output_text(self, output): 52 """Returns the normalized text output, i.e. the output in which 53 the end-of-line characters are normalized to "\n".""" 54 # Running tests on Windows produces "\r\n". The "\n" part is helpfully 55 # changed to "\r\n" by our system (Python/Cygwin), resulting in 56 # "\r\r\n", when, in fact, we wanted to compare the text output with 57 # the normalized text expectation files. 58 return output.replace("\r\r\n", "\r\n").replace("\r\n", "\n") 52 # Some tests produce "\r\n" explicitly. Our system (Python/Cygwin) 53 # helpfully changes the "\n" to "\r\n", resulting in "\r\r\n". 54 norm = output.replace("\r\r\n", "\r\n").strip("\r\n").replace( 55 "\r\n", "\n") 56 return norm + "\n" 59 57 60 58 def compare_output(self, port, filename, test_args, actual_test_output,
Note: See TracChangeset
for help on using the changeset viewer.