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

ojan at chromium.org ojan at chromium.org
Wed Dec 22 13:06:14 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 45ed65417a387433bc9366afd040c0674483081f
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 7 02:05:42 2010 +0000

    2010-09-06  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Kent Tamura.
    
            print out correct error when a DRT thread dies in NRWT
            https://bugs.webkit.org/show_bug.cgi?id=45281
    
            Not sure why, but with the parens, python 2.6.5 on Linux
            gives an error that raise takes 5 arguments and 0 were given.
            Didn't test other platforms or python versions, but putting it
            all on one line fixes it and correctly prints the exception
            from the DRT thread.
    
            * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66859 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4238231..f747a0c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-06  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        print out correct error when a DRT thread dies in NRWT
+        https://bugs.webkit.org/show_bug.cgi?id=45281
+
+        Not sure why, but with the parens, python 2.6.5 on Linux
+        gives an error that raise takes 5 arguments and 0 were given.
+        Didn't test other platforms or python versions, but putting it
+        all on one line fixes it and correctly prints the exception
+        from the DRT thread.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-09-06  Eric Seidel  <eric at webkit.org>
 
         Unreviewed, just adding some emails from lists.webkit.org.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index 4132260..ff27927 100755
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -675,8 +675,7 @@ class TestRunner:
                         # clear that testing was aborted. Otherwise,
                         # the tests that did not run would be assumed
                         # to have passed.
-                        raise (exception_info[0], exception_info[1],
-                               exception_info[2])
+                        raise exception_info[0], exception_info[1], exception_info[2]
 
                     if thread.isAlive():
                         some_thread_is_alive = True

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list