diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 18:52:23 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 18:52:23 +0000 |
| commit | 941ac7fca4afc89cb28ffa760f5a4a4ca077912c (patch) | |
| tree | 30a8c3b1be0c531e501f8d9af7429e042a5e530b | |
| parent | dfbe9533589a3ffffce382ed3dce91dda2cc6041 (diff) | |
| download | chromium_src-941ac7fca4afc89cb28ffa760f5a4a4ca077912c.zip chromium_src-941ac7fca4afc89cb28ffa760f5a4a4ca077912c.tar.gz chromium_src-941ac7fca4afc89cb28ffa760f5a4a4ca077912c.tar.bz2 | |
Normalise layout test line endings to use UNIX style.
On Linux, the diffs against the Windows baselines fail if the baseline
has \r\n line endings. The output from the test shell already appears to
be normalised to \n endings, so it's not clear to me how Windows diff
works in this case unless the Windows tools are automatically detecting
and fixing the line endings.
Review URL: http://codereview.chromium.org/11280
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5689 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/tools/layout_tests/test_types/text_diff.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_types/text_diff.py b/webkit/tools/layout_tests/test_types/text_diff.py index 97e11b3..cf3c6c4 100644 --- a/webkit/tools/layout_tests/test_types/text_diff.py +++ b/webkit/tools/layout_tests/test_types/text_diff.py @@ -43,7 +43,7 @@ class TestTextDiff(test_type_base.TestTypeBase): return expected # Normalize line endings - return expected.strip("\r\n") + "\n" + return expected.strip("\r\n").replace("\r\n", "\n") + "\n" def CompareOutput(self, filename, proc, output, test_args): """Implementation of CompareOutput that checks the output text against the |