Fixed rebasline iamge....

webkit/tools/layout_tests/layout_package/test_shell_thread.py

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A Thread object for running the test shell and processing URLs from a
 shared queue.
 
 Each thread runs a separate instance of the test_shell binary and validates
 the output.  When there are no more URLs to process in the shared queue, the
 thread exits.
@@ skipping 342 matching lines @@
     Args:
       test_info: Object containing the test filename, uri and timeout
 
     Return:
       A list of TestFailure objects describing the error.
     """
     self._EnsureTestShellIsRunning()
     # 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 bogus 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
     # this test shell process, than the test shell did not
     # successfully start. If this is not the first test, then the
     # previous tests have caused some kind of delayed crash. We don't
     # try to recover here.
     self._test_shell_proc.stdin.flush()
 
     stats = ProcessOutput(self._test_shell_proc, test_info, self._test_types,
@@ skipping 17 matching lines @@
     """Kill the test shell process if it's running."""
     if self._test_shell_proc:
       self._test_shell_proc.stdin.close()
       self._test_shell_proc.stdout.close()
       if self._test_shell_proc.stderr:
         self._test_shell_proc.stderr.close()
       if sys.platform not in ('win32', 'cygwin'):
         # Closing stdin/stdout/stderr hangs sometimes on OS X.
         subprocess.Popen(["kill", "-9", str(self._test_shell_proc.pid)])
       self._test_shell_proc = None