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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 56a39e5de6e73f2a21529e722efe1dabf03ae12e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 02:51:40 2010 +0000

    2010-01-07  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Nikolas Zimmermann.
    
            media/unsupported-tracks.html is failing on Snow Leopard Release bot
            https://bugs.webkit.org/show_bug.cgi?id=32339
    
            This is a speculative fix.  I do not have a Snow Leopard machine to test on
            and I've not seen mention of someone being able to reproduce this locally.
    
            Prevent watchdog timer from firing after a test completes but before
            the next one starts, causing the error to appear in the next test.
    
            * DumpRenderTree/mac/DumpRenderTree.mm:
            (dump): Stop the watchdog before printing #EOF for the test content.
            We only need to care about the JavaScript of the test running too long
            or some hang in WebCore.  Any other failures will be covered by the calling
            script's own watchdog timer.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52966 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d5f5c2b..80a280f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,24 @@
 2010-01-07  Eric Seidel  <eric at webkit.org>
 
+        Reviewed by Nikolas Zimmermann.
+
+        media/unsupported-tracks.html is failing on Snow Leopard Release bot
+        https://bugs.webkit.org/show_bug.cgi?id=32339
+
+        This is a speculative fix.  I do not have a Snow Leopard machine to test on
+        and I've not seen mention of someone being able to reproduce this locally.
+
+        Prevent watchdog timer from firing after a test completes but before
+        the next one starts, causing the error to appear in the next test.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (dump): Stop the watchdog before printing #EOF for the test content.
+        We only need to care about the JavaScript of the test running too long
+        or some hang in WebCore.  Any other failures will be covered by the calling
+        script's own watchdog timer.
+
+2010-01-07  Eric Seidel  <eric at webkit.org>
+
         Reviewed by Adam Barth.
 
         commit-queue is stuck spinning due to exception
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
index 4ffeac3..12f216e 100644
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -1075,15 +1075,20 @@ void dump()
         } else
             printf("ERROR: nil result from %s", methodNameStringForFailedTest());
 
+        // Stop the watchdog thread before we leave this test to make sure it doesn't
+        // fire in between tests causing the next test to fail.
+        // This is a speculative fix for: https://bugs.webkit.org/show_bug.cgi?id=32339
+        invalidateAnyPreviousWaitToDumpWatchdog();
+
         if (printSeparators) {
             puts("#EOF");       // terminate the content block
             fputs("#EOF\n", stderr);
         }            
     }
-    
+
     if (dumpPixels && !dumpAsText)
         dumpWebViewAsPixelsAndCompareWithExpected(gLayoutTestController->expectedPixelHash());
-    
+
     puts("#EOF");   // terminate the (possibly empty) pixels block
 
     fflush(stdout);

-- 
WebKit Debian packaging