[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit f00c0851da55b34b9ebed5563ec3550122cda47a
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 22:42:19 2010 +0000

    2010-03-12  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Adam Barth.
    
            Fix new-run-webkit-tests --run-singly
    
            This script option is currently broken - the script attempts to
            dereference methods and variables that don't exist, which causes
            the Chromium Linux valgrind bot to be quite unhappy. This has been
            broken since r54449 when I renamed Port.start_test_driver to
            Port.start_driver.
    
            https://bugs.webkit.org/show_bug.cgi?id=36042
    
            * Scripts/webkitpy/layout_tests/layout_package/test_shell_thread.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55937 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index fb5da79..158f848 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-03-12  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Fix new-run-webkit-tests --run-singly
+
+        This script option is currently broken - the script attempts to
+        dereference methods and variables that don't exist, which causes
+        the Chromium Linux valgrind bot to be quite unhappy. This has been
+        broken since r54449 when I renamed Port.start_test_driver to
+        Port.start_driver.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36042
+
+        * Scripts/webkitpy/layout_tests/layout_package/test_shell_thread.py:
+
 2010-03-12  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Fix critical being printed to stderr on every test. This is
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_shell_thread.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_shell_thread.py
index a8f41f3..de38dff 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_shell_thread.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_shell_thread.py
@@ -149,15 +149,15 @@ class SingleTestThread(threading.Thread):
         self._output_dir = output_dir
 
     def run(self):
-        driver = self._port.start_test_driver(self._image_path,
-            self._shell_args)
+        test_info = self._test_info
+        driver = self._port.start_driver(self._image_path, self._shell_args)
         start = time.time()
         crash, timeout, actual_checksum, output, error = \
             driver.run_test(test_info.uri.strip(), test_info.timeout,
                             test_info.image_hash)
         end = time.time()
         self._test_stats = process_output(self._port,
-            self._test_info, self._test_types, self._test_args,
+            test_info, self._test_types, self._test_args,
             self._target, self._output_dir, crash, timeout, end - start,
             actual_checksum, output, error)
         driver.stop()

-- 
WebKit Debian packaging