diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 18:17:15 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 18:17:15 +0000 |
| commit | 2cfcb979e25f206757cf4163431ab4494c418046 (patch) | |
| tree | 1ff87475d51d6871fd03fc69f217d6101c7c8258 /webkit/tools/layout_tests/layout_package | |
| parent | 2bbaf85a0682c864eb3de06ac417b32d360c3256 (diff) | |
| download | chromium_src-2cfcb979e25f206757cf4163431ab4494c418046.zip chromium_src-2cfcb979e25f206757cf4163431ab4494c418046.tar.gz chromium_src-2cfcb979e25f206757cf4163431ab4494c418046.tar.bz2 | |
Fixed rebasline iamge.
BUG=11072
TEST=Did a rebasline of a test that didn't have and image change and
saw that the image was still correct after the rebaseline.
Review URL: http://codereview.chromium.org/99064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests/layout_package')
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/test_shell_thread.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/layout_package/test_shell_thread.py b/webkit/tools/layout_tests/layout_package/test_shell_thread.py index ddf0e24..a368137 100644 --- a/webkit/tools/layout_tests/layout_package/test_shell_thread.py +++ b/webkit/tools/layout_tests/layout_package/test_shell_thread.py @@ -360,9 +360,14 @@ class TestShellThread(threading.Thread): # Args to test_shell is a space-separated list of "uri timeout pixel_hash" # The timeout and pixel_hash are optional. The timeout is used if this # test has a custom timeout. The pixel_hash is used to avoid doing an image - # dump if the checksums match. + # dump if the checksums match, so it should be set to a blank value if we + # are generating a new baseline. (Otherwise, an image from a previous run + # will be copied into the baseline.) + image_hash = test_info.image_hash + if image_hash and self._test_args.new_baseline: + image_hash = "" self._test_shell_proc.stdin.write(("%s %s %s\n" % - (test_info.uri, test_info.timeout, test_info.image_hash))) + (test_info.uri, test_info.timeout, image_hash))) # If the test shell is dead, the above may cause an IOError as we # try to write onto the broken pipe. If this is the first test for |