diff options
| author | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 15:07:14 +0000 |
|---|---|---|
| committer | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 15:07:14 +0000 |
| commit | a946aa310237b41610178389cc946e162cc6587f (patch) | |
| tree | c3375b376dea0517849443c3867d916ecde70f05 /webkit | |
| parent | 7069c8c6a27edef7b09227d8789595df1c62b422 (diff) | |
| download | chromium_src-a946aa310237b41610178389cc946e162cc6587f.zip chromium_src-a946aa310237b41610178389cc946e162cc6587f.tar.gz chromium_src-a946aa310237b41610178389cc946e162cc6587f.tar.bz2 | |
Fixes the layout test formatter to output the correct HTML for upstream baselines.
R=ojan
BUG=none
TEST=run test_output_formatter.py -- html output for upstream baselines should be consistent with other images.
Review URL: http://codereview.chromium.org/273061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/failure.py | 5 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/html_generator.py | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/webkit/tools/layout_tests/layout_package/failure.py b/webkit/tools/layout_tests/layout_package/failure.py index 80b1cbe..91abfa7f 100644 --- a/webkit/tools/layout_tests/layout_package/failure.py +++ b/webkit/tools/layout_tests/layout_package/failure.py @@ -12,7 +12,7 @@ UNKNOWN = "Unknown" EXPECTED_IMAGE_FILE_ENDING = "-expected.png" ACTUAL_IMAGE_FILE_ENDING = "-actual.png" -UPSTREAM_IMAGE_FILE_ENDING = "-upstream.png" +UPSTREAM_IMAGE_FILE_ENDING = "-expected-upstream.png" EXPECTED_TEXT_FILE_ENDING = "-expected.txt" ACTUAL_TEXT_FILE_ENDING = "-actual.txt" DIFF_IMAGE_FILE_ENDING = "-diff.png" @@ -85,6 +85,9 @@ class Failure(object): def GetTextDiffFilename(self): return self._RenameEndOfTestPath(DIFF_TEXT_FILE_ENDING) + def GetImageUpstreamFilename(self): + return self._RenameEndOfTestPath(UPSTREAM_IMAGE_FILE_ENDING) + def _RenameEndOfTestPath(self, suffix): last_index = self.test_path.rfind(".") if last_index == -1: diff --git a/webkit/tools/layout_tests/layout_package/html_generator.py b/webkit/tools/layout_tests/layout_package/html_generator.py index 0ccd2ce..6936d8c 100644 --- a/webkit/tools/layout_tests/layout_package/html_generator.py +++ b/webkit/tools/layout_tests/layout_package/html_generator.py @@ -209,11 +209,7 @@ class HTMLGenerator(object): html += self._GenerateImageFailureTD(failure.GetImageDiffFilename()) if (failure.image_baseline_upstream_local and failure.image_baseline_upstream_local != ""): - html += """ - <td><a href="%s"><img style="width: %s" src="%s" /></a></td> - """ % (failure.image_baseline_upstream_local, - self.image_size, - failure.image_baseline_upstream_local) + html += self._GenerateImageFailureTD(failure.GetImageUpstreamFilename()) else: html += """ <td> </td> |