[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 5214a6b5351c14886d1ee8d3b1cb20c168f23ba0
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 1 06:41:14 2009 +0000

    2009-11-30  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Eric Seidel.
    
            [GTK] Moved the functions that are closing the result log of the
            tests to the last line of the runTest function, this avoids
            reporting crashes in the wrong test if there is a problem when
            reseting the state after the test.
    
            * DumpRenderTree/gtk/DumpRenderTree.cpp:
            (dump):
            (runTest):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51525 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4ebe028..b5c5c17 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-30  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] Moved the functions that are closing the result log of the
+        tests to the last line of the runTest function, this avoids
+        reporting crashes in the wrong test if there is a problem when
+        reseting the state after the test.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (dump):
+        (runTest):
+
 2009-11-30  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Geoffrey Garen.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 768f0e0..d32b096 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -405,11 +405,6 @@ void dump()
 
     // FIXME: call displayWebView here when we support --paint
 
-    puts("#EOF"); // terminate the (possibly empty) pixels block
-
-    fflush(stdout);
-    fflush(stderr);
-
     done = true;
     gtk_main_quit();
 }
@@ -433,6 +428,14 @@ static void setDefaultsToConsistentStateValuesForTesting()
     g_free(databaseDirectory);
 }
 
+static void sendPixelResultsEOF()
+{
+    puts("#EOF");
+
+    fflush(stdout);
+    fflush(stderr);
+}
+
 static void runTest(const string& testPathOrURL)
 {
     ASSERT(!testPathOrURL.empty());
@@ -513,6 +516,9 @@ static void runTest(const string& testPathOrURL)
 
     gLayoutTestController->deref();
     gLayoutTestController = 0;
+
+    // terminate the (possibly empty) pixels block after all the state reset
+    sendPixelResultsEOF();
 }
 
 void webViewLoadStarted(WebKitWebView* view, WebKitWebFrame* frame, void*)

-- 
WebKit Debian packaging