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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 14:37:01 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit fb8d90a86b0107dabcd19e753976a299c53cb091
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 06:58:30 2010 +0000

    2010-10-13  James Simonsen  <simonjam at chromium.org>
    
            Reviewed by Adam Barth.
    
            Sync tests from html5lib.
            https://bugs.webkit.org/show_bug.cgi?id=47627
    
            * html5lib/resources/adoption02.dat: Copied from html5lib.
            * html5lib/resources/entities01.dat: Ditto.
            * html5lib/resources/pending-spec-changes.dat: Ditto.
            * html5lib/resources/tests21.dat: Ditto.
            * html5lib/runner-expected.txt: 2 tests now pass.
            * platform/chromium/html5lib/runner-expected.txt: Ditto.
            * platform/win/html5lib/runner-expected.txt: Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69745 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f5e0947..37b1e2b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-13  James Simonsen  <simonjam at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Sync tests from html5lib.
+        https://bugs.webkit.org/show_bug.cgi?id=47627
+
+        * html5lib/resources/adoption02.dat: Copied from html5lib.
+        * html5lib/resources/entities01.dat: Ditto.
+        * html5lib/resources/pending-spec-changes.dat: Ditto.
+        * html5lib/resources/tests21.dat: Ditto.
+        * html5lib/runner-expected.txt: 2 tests now pass.
+        * platform/chromium/html5lib/runner-expected.txt: Ditto.
+        * platform/win/html5lib/runner-expected.txt: Ditto.
+
 2010-10-13  Martin Robinson  <mrobinson at igalia.com>
 
         Rebaseline canvas/philip/tests/2d.gradient.radial.negative.html. It seems
diff --git a/LayoutTests/html5lib/resources/adoption02.dat b/LayoutTests/html5lib/resources/adoption02.dat
index e6e6826..d18151b 100644
--- a/LayoutTests/html5lib/resources/adoption02.dat
+++ b/LayoutTests/html5lib/resources/adoption02.dat
@@ -16,29 +16,6 @@
 |         "4"
 
 #data
-<b id="b">1<i id="i">2<p>3<script>document.getElementById("b").id = "c";document.getElementById("i").id = "j"</script></b>4
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="i"
-|       <p>
-|         <b>
-|           id="b"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
-
-#data
 <a><div><style></style><address><a>
 #errors
 #document
diff --git a/LayoutTests/html5lib/resources/entities01.dat b/LayoutTests/html5lib/resources/entities01.dat
index 926642e..c8073b7 100644
--- a/LayoutTests/html5lib/resources/entities01.dat
+++ b/LayoutTests/html5lib/resources/entities01.dat
@@ -189,15 +189,6 @@ FOO&#x0000;ZOO
 |     "FOO�ZOO"
 
 #data
-FOO&#x000D;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO
ZOO"
-
-#data
 FOO&#x0078;ZOO
 #errors
 #document
diff --git a/LayoutTests/html5lib/resources/pending-spec-changes.dat b/LayoutTests/html5lib/resources/pending-spec-changes.dat
index 4663c8b..b933025 100644
--- a/LayoutTests/html5lib/resources/pending-spec-changes.dat
+++ b/LayoutTests/html5lib/resources/pending-spec-changes.dat
@@ -1,45 +1,8 @@
 #data
-FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
+Placeholder
 #errors
-3: Non-space characters found without seeing a doctype first. Expected “<!DOCTYPE html>”.
-15: Consecutive hyphens did not terminate a comment. “--” is not permitted inside a comment, but e.g. “- -” is.
-24: Consecutive hyphens did not terminate a comment. “--” is not permitted inside a comment, but e.g. “- -” is.
-31: Consecutive hyphens did not terminate a comment. “--” is not permitted inside a comment, but e.g. “- -” is.
-35: End of file inside comment.
 #document
 | <html>
 |   <head>
 |   <body>
-|     "FOO"
-|     <!--  BAR -- <QUX> -- MUX -- >BAZ -->
-
-#data
-FOO<!-- BAR --   >BAZ
-#errors
-3: Non-space characters found without seeing a doctype first. Expected “<!DOCTYPE html>”.
-15: Consecutive hyphens did not terminate a comment. “--” is not permitted inside a comment, but e.g. “- -” is.
-21: End of file inside comment.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  BAR --   >BAZ -->
-
-#data
-<svg><![CDATA[]]
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-
-#data
-<svg><![CDATA[]
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
+|     "Placeholder"
diff --git a/LayoutTests/html5lib/resources/tests21.dat b/LayoutTests/html5lib/resources/tests21.dat
index 9acc845..1260ec0 100644
--- a/LayoutTests/html5lib/resources/tests21.dat
+++ b/LayoutTests/html5lib/resources/tests21.dat
@@ -87,6 +87,26 @@
 |       "]] >"
 
 #data
+<svg><![CDATA[]]
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "]]"
+
+#data
+<svg><![CDATA[]
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "]"
+
+#data
 <svg><![CDATA[]>a
 #errors
 #document
diff --git a/LayoutTests/html5lib/runner-expected.txt b/LayoutTests/html5lib/runner-expected.txt
index c4d0f90..b24c3ad 100644
--- a/LayoutTests/html5lib/runner-expected.txt
+++ b/LayoutTests/html5lib/runner-expected.txt
@@ -11,37 +11,8 @@ CONSOLE MESSAGE: line 2: PASS
 CONSOLE MESSAGE: line 2: FOO<span>BAR</span>BAZ
 resources/pending-spec-changes-plain-text-unsafe.dat: PASS
 
-resources/pending-spec-changes.dat:
-3
-4
+resources/pending-spec-changes.dat: PASS
 
-Test 3 of 4 in resources/pending-spec-changes.dat failed. Input:
-<svg><![CDATA[]]
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]]"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-
-Test 4 of 4 in resources/pending-spec-changes.dat failed. Input:
-<svg><![CDATA[]
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
 resources/plain-text-unsafe.dat: PASS
 
 resources/tests1.dat: PASS
@@ -229,49 +200,8 @@ resources/comments01.dat: PASS
 
 resources/adoption01.dat: PASS
 
-resources/adoption02.dat:
-2
+resources/adoption02.dat: PASS
 
-Test 2 of 3 in resources/adoption02.dat failed. Input:
-<b id="b">1<i id="i">2<p>3<script>document.getElementById("b").id = "c";document.getElementById("i").id = "j"</script></b>4
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="j"
-|       <p>
-|         <b>
-|           id="c"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="i"
-|       <p>
-|         <b>
-|           id="b"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
 resources/inbody01.dat: PASS
 
 resources/isindex.dat: PASS
diff --git a/LayoutTests/platform/chromium/html5lib/runner-expected.txt b/LayoutTests/platform/chromium/html5lib/runner-expected.txt
index 42af374..ae08bbe 100755
--- a/LayoutTests/platform/chromium/html5lib/runner-expected.txt
+++ b/LayoutTests/platform/chromium/html5lib/runner-expected.txt
@@ -11,37 +11,8 @@ CONSOLE MESSAGE: line 2: PASS
 CONSOLE MESSAGE: line 2: FOO<span>BAR</span>BAZ
 resources/pending-spec-changes-plain-text-unsafe.dat: PASS
 
-resources/pending-spec-changes.dat:
-3
-4
+resources/pending-spec-changes.dat: PASS
 
-Test 3 of 4 in resources/pending-spec-changes.dat failed. Input:
-<svg><![CDATA[]]
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]]"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-
-Test 4 of 4 in resources/pending-spec-changes.dat failed. Input:
-<svg><![CDATA[]
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
 resources/plain-text-unsafe.dat: PASS
 
 resources/tests1.dat: PASS
@@ -225,49 +196,8 @@ resources/comments01.dat: PASS
 
 resources/adoption01.dat: PASS
 
-resources/adoption02.dat:
-2
+resources/adoption02.dat: PASS
 
-Test 2 of 3 in resources/adoption02.dat failed. Input:
-<b id="b">1<i id="i">2<p>3<script>document.getElementById("b").id = "c";document.getElementById("i").id = "j"</script></b>4
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="j"
-|       <p>
-|         <b>
-|           id="c"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="i"
-|       <p>
-|         <b>
-|           id="b"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
 resources/inbody01.dat: PASS
 
 resources/isindex.dat: PASS
diff --git a/LayoutTests/platform/win/html5lib/runner-expected.txt b/LayoutTests/platform/win/html5lib/runner-expected.txt
index 318d94e..e6259c8 100644
--- a/LayoutTests/platform/win/html5lib/runner-expected.txt
+++ b/LayoutTests/platform/win/html5lib/runner-expected.txt
@@ -11,37 +11,8 @@ CONSOLE MESSAGE: line 2: PASS
 CONSOLE MESSAGE: line 2: FOO<span>BAR</span>BAZ
 resources/pending-spec-changes-plain-text-unsafe.dat: PASS
 
-resources/pending-spec-changes.dat:
-3
-4
+resources/pending-spec-changes.dat: PASS
 
-Test 3 of 4 in resources/pending-spec-changes.dat failed. Input:
-<svg><![CDATA[]]
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]]"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-
-Test 4 of 4 in resources/pending-spec-changes.dat failed. Input:
-<svg><![CDATA[]
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
 resources/plain-text-unsafe.dat: PASS
 
 resources/tests1.dat: PASS
@@ -187,49 +158,8 @@ resources/comments01.dat: PASS
 
 resources/adoption01.dat: PASS
 
-resources/adoption02.dat:
-2
+resources/adoption02.dat: PASS
 
-Test 2 of 3 in resources/adoption02.dat failed. Input:
-<b id="b">1<i id="i">2<p>3<script>document.getElementById("b").id = "c";document.getElementById("i").id = "j"</script></b>4
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="j"
-|       <p>
-|         <b>
-|           id="c"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="i"
-|       <p>
-|         <b>
-|           id="b"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
 resources/inbody01.dat: PASS
 
 resources/isindex.dat: PASS

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list