diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/layout_tests/test_types/text_diff.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/layout_tests/test_types/text_diff.py | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Tools/Scripts/webkitpy/layout_tests/test_types/text_diff.py b/Tools/Scripts/webkitpy/layout_tests/test_types/text_diff.py index 7b7febe..07c3d03 100644 --- a/Tools/Scripts/webkitpy/layout_tests/test_types/text_diff.py +++ b/Tools/Scripts/webkitpy/layout_tests/test_types/text_diff.py @@ -53,26 +53,16 @@ class TestTextDiff(test_type_base.TestTypeBase): # the normalized text expectation files. return output.replace("\r\r\n", "\r\n").replace("\r\n", "\n") - def compare_output(self, port, filename, test_args, actual_test_output, - expected_test_output): + def compare_output(self, port, filename, options, actual_driver_output, + expected_driver_output): """Implementation of CompareOutput that checks the output text against the expected text from the LayoutTest directory.""" failures = [] - # If we're generating a new baseline, we pass. - if test_args.new_baseline or test_args.reset_results: - # Although all test_shell/DumpRenderTree output should be utf-8, - # we do not ever decode it inside run-webkit-tests. For some tests - # DumpRenderTree may not output utf-8 text (e.g. webarchives). - self._save_baseline_data(filename, actual_test_output.text, - ".txt", encoding=None, - generate_new_baseline=test_args.new_baseline) - return failures - # Normalize text to diff - actual_text = self._get_normalized_output_text(actual_test_output.text) + actual_text = self._get_normalized_output_text(actual_driver_output.text) # Assuming expected_text is already normalized. - expected_text = expected_test_output.text + expected_text = expected_driver_output.text # Write output files for new tests, too. if port.compare_text(actual_text, expected_text): |