[WK2] http/tests/navigation/anchor-frames-gbk.html fails

https://bugs.webkit.org/show_bug.cgi?id=76896

Reviewed by Darin Adler.

Tools:

Only dump as text if currently dumping render tree. This ensures that
calling dumpAsText in a test with dumpChildFramesAsText already being
called doesn't override the first decision, possibly making tests fail.

* WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
(WTR::LayoutTestController::dumpAsText):

LayoutTests:

Unskip the now-passing test for Mac and Qt WK2 ports.

* platform/mac-wk2/Skipped:
* platform/qt-5.0-wk2/Skipped:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@115572 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 28980c5..d287b6b 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
 2012-04-28  Zan Dobersek  <zandobersek@gmail.com>
 
+        [WK2] http/tests/navigation/anchor-frames-gbk.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=76896
+
+        Reviewed by Darin Adler.
+
+        Unskip the now-passing test for Mac and Qt WK2 ports.
+
+        * platform/mac-wk2/Skipped:
+        * platform/qt-5.0-wk2/Skipped:
+
+2012-04-28  Zan Dobersek  <zandobersek@gmail.com>
+
         Unreviewed, adding a Gtk-specific baseline for
         fast/dom/Window/window-lookup-precedence.html.
 

diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index e3a8520..783cf5c 100644 (file)
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -218,10 +218,6 @@ fast/events/pageshow-pagehide-on-back-cached.html
 # https://bugs.webkit.org/show_bug.cgi?id=81613
 http/tests/loading/progress-finished-callback.html
 
-# [WK2] http/tests/navigation/anchor-frames-gbk.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=76896
-http/tests/navigation/anchor-frames-gbk.html
-
 # [WK2] http/tests/navigation/https-in-page-cache.html times out on mac-wk2
 # https://bugs.webkit.org/show_bug.cgi?id=81622
 http/tests/navigation/https-in-page-cache.html

diff --git a/LayoutTests/platform/qt-5.0-wk2/Skipped b/LayoutTests/platform/qt-5.0-wk2/Skipped
index 804d612..95f7b84 100644 (file)
--- a/LayoutTests/platform/qt-5.0-wk2/Skipped
+++ b/LayoutTests/platform/qt-5.0-wk2/Skipped
@@ -410,10 +410,6 @@ tables/mozilla_expected_failures/marvin/backgr_border-table-row-group.html
 tables/mozilla_expected_failures/marvin/backgr_layers-show.html
 tables/mozilla_expected_failures/marvin/backgr_position-table-column.html
 
-# [Qt][WK2] http/tests/navigation/anchor-frames-gbk.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=76896
-http/tests/navigation/anchor-frames-gbk.html
-
 # [Qt][WK2] scrollbars/scroll-rtl-or-bt-layer.html fails
 # https://bugs.webkit.org/show_bug.cgi?id=76986
 scrollbars/scroll-rtl-or-bt-layer.html

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 560e3ab..f678847 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2012-04-28  Zan Dobersek  <zandobersek@gmail.com>
+
+        [WK2] http/tests/navigation/anchor-frames-gbk.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=76896
+
+        Reviewed by Darin Adler.
+
+        Only dump as text if currently dumping render tree. This ensures that
+        calling dumpAsText in a test with dumpChildFramesAsText already being
+        called doesn't override the first decision, possibly making tests fail.
+
+        * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp:
+        (WTR::LayoutTestController::dumpAsText):
+
 2012-04-28  Dan Winship  <danw@gnome.org>
 
         Unreviewed; Add me to the SoupNetwork watchlist

diff --git a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
index bb3968c..55bf9dd 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp
@@ -133,7 +133,8 @@ void LayoutTestController::display()
 
 void LayoutTestController::dumpAsText(bool dumpPixels)
 {
-    m_whatToDump = MainFrameText;
+    if (m_whatToDump < MainFrameText)
+        m_whatToDump = MainFrameText;
     m_dumpPixels = dumpPixels;
 }