svg/webarchive tests are flakey under guard malloc

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

Reviewed by Zoltan Herczeg.

Fix flakey tests, by moving the <script> that dumps the test as webarchive, after the actual content.

* svg/webarchive/svg-cursor-subresources-expected.webarchive:
* svg/webarchive/svg-cursor-subresources.svg:
* svg/webarchive/svg-feimage-subresources-expected.webarchive:
* svg/webarchive/svg-feimage-subresources.svg:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1cc5e02..fce4b38 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2012-01-26  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        svg/webarchive tests are flakey under guard malloc
+        https://bugs.webkit.org/show_bug.cgi?id=77092
+
+        Reviewed by Zoltan Herczeg.
+
+        Fix flakey tests, by moving the <script> that dumps the test as webarchive, after the actual content.
+
+        * svg/webarchive/svg-cursor-subresources-expected.webarchive:
+        * svg/webarchive/svg-cursor-subresources.svg:
+        * svg/webarchive/svg-feimage-subresources-expected.webarchive:
+        * svg/webarchive/svg-feimage-subresources.svg:
+
 2012-01-26  Anton Muhin  <antonm@chromium.org>
 
         Unreviewed rebaseline after http://trac.webkit.org/changeset/105977.

diff --git a/LayoutTests/svg/webarchive/svg-cursor-subresources-expected.webarchive b/LayoutTests/svg/webarchive/svg-cursor-subresources-expected.webarchive
index 82c300c..4381b19 100644 (file)
--- a/LayoutTests/svg/webarchive/svg-cursor-subresources-expected.webarchive
+++ b/LayoutTests/svg/webarchive/svg-cursor-subresources-expected.webarchive
@@ -6,14 +6,20 @@
        <dict>
                <key>WebResourceData</key>
                <string>&lt;svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"&gt;
-  &lt;script&gt;
-    if (window.layoutTestController)
-        layoutTestController.dumpDOMAsWebArchive();
-  &lt;/script&gt;
   &lt;cursor id="mycursor" xlink:href="resources/green-checker.png"/&gt;
   &lt;rect style="cursor: url(#mycursor)" width="100" height="100" fill="white" stroke="blue"/&gt;
   
   &lt;text x="10" y="130"&gt;Hover over the rect, you should see a (large) custom cursor&lt;/text&gt;
+  &lt;script&gt;
+    if (window.layoutTestController) {
+        layoutTestController.waitUntilDone();
+
+        setTimeout(function() {
+            layoutTestController.dumpDOMAsWebArchive();
+            layoutTestController.notifyDone();
+        }, 0);
+    }
+ &lt;/script&gt;
 &lt;/svg&gt;</string>
                <key>WebResourceFrameName</key>
                <string></string>

diff --git a/LayoutTests/svg/webarchive/svg-cursor-subresources.svg b/LayoutTests/svg/webarchive/svg-cursor-subresources.svg
index 06550c0..634c728 100644 (file)
--- a/LayoutTests/svg/webarchive/svg-cursor-subresources.svg
+++ b/LayoutTests/svg/webarchive/svg-cursor-subresources.svg
@@ -1,10 +1,16 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpDOMAsWebArchive();
-  </script>
   <cursor id="mycursor" xlink:href="resources/green-checker.png" />
   <rect style="cursor: url(#mycursor)" width="100" height="100" fill="white" stroke="blue" />
   
   <text x="10" y="130">Hover over the rect, you should see a (large) custom cursor</text>
+  <script>
+    if (window.layoutTestController) {
+        layoutTestController.waitUntilDone();
+
+        setTimeout(function() {
+            layoutTestController.dumpDOMAsWebArchive();
+            layoutTestController.notifyDone();
+        }, 0);
+    }
+ </script>
 </svg>

diff --git a/LayoutTests/svg/webarchive/svg-feimage-subresources-expected.webarchive b/LayoutTests/svg/webarchive/svg-feimage-subresources-expected.webarchive
index 4a56165..43afb41 100644 (file)
--- a/LayoutTests/svg/webarchive/svg-feimage-subresources-expected.webarchive
+++ b/LayoutTests/svg/webarchive/svg-feimage-subresources-expected.webarchive
@@ -6,14 +6,20 @@
        <dict>
                <key>WebResourceData</key>
                <string>&lt;svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"&gt;
-  &lt;script&gt;
-    if (window.layoutTestController)
-        layoutTestController.dumpDOMAsWebArchive();
-  &lt;/script&gt;
   &lt;filter id="MyFilter"&gt;
     &lt;feImage xlink:href="resources/green-checker.png"/&gt;
   &lt;/filter&gt;
   &lt;rect id="rect" width="100" height="100" fill="red" filter="url(#MyFilter)"/&gt;
+  &lt;script&gt;
+    if (window.layoutTestController) {
+        layoutTestController.waitUntilDone();
+
+        setTimeout(function() {
+            layoutTestController.dumpDOMAsWebArchive();
+            layoutTestController.notifyDone();
+        }, 0);
+    }
+  &lt;/script&gt;
 &lt;/svg&gt;</string>
                <key>WebResourceFrameName</key>
                <string></string>

diff --git a/LayoutTests/svg/webarchive/svg-feimage-subresources.svg b/LayoutTests/svg/webarchive/svg-feimage-subresources.svg
index 09ee5ba..068a9b3 100644 (file)
--- a/LayoutTests/svg/webarchive/svg-feimage-subresources.svg
+++ b/LayoutTests/svg/webarchive/svg-feimage-subresources.svg
@@ -1,10 +1,16 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <script>
-    if (window.layoutTestController)
-        layoutTestController.dumpDOMAsWebArchive();
-  </script>
   <filter id="MyFilter">
     <feImage xlink:href="resources/green-checker.png" />
   </filter>
   <rect id="rect" width="100" height="100" fill="red" filter="url(#MyFilter)"/>
+  <script>
+    if (window.layoutTestController) {
+        layoutTestController.waitUntilDone();
+
+        setTimeout(function() {
+            layoutTestController.dumpDOMAsWebArchive();
+            layoutTestController.notifyDone();
+        }, 0);
+    }
+  </script>
 </svg>