[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f649e9790184773781dd8359499cfbfdf2e35ec9
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 15:48:48 2010 +0000

    [NRWT] Don't use image hash when it's no need in single test mode.
    https://bugs.webkit.org/show_bug.cgi?id=48326
    
    Patch by Gabor Rapcsanyi <rgabor at inf.u-szeged.hu> on 2010-10-27
    Reviewed by Ojan Vafai.
    
    * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70648 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0179bb3..2562831 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-27  Gabor Rapcsanyi  <rgabor at inf.u-szeged.hu>
+
+        Reviewed by Ojan Vafai.
+
+        [NRWT] Don't use image hash when it's no need in single test mode.
+        https://bugs.webkit.org/show_bug.cgi?id=48326
+
+        * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py:
+
 2010-10-27  David Kilzer  <ddkilzer at apple.com>
 
         Fix leak of CFMutableDictionaryRef in createXMLStringFromWebArchiveData()
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
index e0fd1b6..ab10e0a 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
@@ -152,6 +152,13 @@ def _milliseconds_to_seconds(msecs):
     return float(msecs) / 1000.0
 
 
+def _image_hash(test_info, test_args, options):
+    """Returns the image hash of the test if it's needed, otherwise None."""
+    if (test_args.new_baseline or test_args.reset_results or not options.pixel_tests):
+        return None
+    return test_info.image_hash()
+
+
 class TestResult(object):
 
     def __init__(self, filename, failures, test_run_time,
@@ -196,10 +203,11 @@ class SingleTestThread(threading.Thread):
         self._driver = self._port.create_driver(self._test_args.png_path,
                                                 self._options)
         self._driver.start()
+        image_hash = _image_hash(test_info, self._test_args, self._options)
         start = time.time()
         crash, timeout, actual_checksum, output, error = \
             self._driver.run_test(test_info.uri.strip(), test_info.timeout,
-                                  test_info.image_hash())
+                                  image_hash)
         end = time.time()
         self._test_result = _process_output(self._port, self._options,
             test_info, self._test_types, self._test_args,
@@ -518,11 +526,7 @@ class TestShellThread(WatchableThread):
         # 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 or self._test_args.reset_results or
-            not self._options.pixel_tests)):
-            image_hash = ""
+        image_hash = _image_hash(test_info, self._test_args, self._options)
         start = time.time()
 
         thread_timeout = _milliseconds_to_seconds(

-- 
WebKit Debian packaging