[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 13:40:57 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b57f45120504ff623d0972a8e56c4763e9c78a1f
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 23 11:13:58 2010 +0000
2010-09-23 Adam Barth <abarth at webkit.org>
Rubber-stamped by Eric Seidel.
Sync HTML5lib tests with upstream.
* html5lib/resources/comments01.dat:
* html5lib/resources/pending-spec-changes-plain-text-unsafe.dat: Added.
* html5lib/resources/pending-spec-changes.dat: Added.
* html5lib/resources/plain-text-unsafe.dat: Added.
* html5lib/resources/tests1.dat:
* html5lib/resources/tests10.dat:
* html5lib/resources/tests13.dat: Removed.
* html5lib/resources/tests14.dat:
* html5lib/resources/tests15.dat:
* html5lib/resources/tests17.dat:
* html5lib/resources/tests19.dat:
* html5lib/resources/tests20.dat:
* html5lib/resources/tests21.dat:
* html5lib/resources/tests9.dat:
* html5lib/resources/tests_innerHTML_1.dat:
* html5lib/runner-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68129 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e560ded..789227d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2010-09-23 Adam Barth <abarth at webkit.org>
+
+ Rubber-stamped by Eric Seidel.
+
+ Sync HTML5lib tests with upstream.
+
+ * html5lib/resources/comments01.dat:
+ * html5lib/resources/pending-spec-changes-plain-text-unsafe.dat: Added.
+ * html5lib/resources/pending-spec-changes.dat: Added.
+ * html5lib/resources/plain-text-unsafe.dat: Added.
+ * html5lib/resources/tests1.dat:
+ * html5lib/resources/tests10.dat:
+ * html5lib/resources/tests13.dat: Removed.
+ * html5lib/resources/tests14.dat:
+ * html5lib/resources/tests15.dat:
+ * html5lib/resources/tests17.dat:
+ * html5lib/resources/tests19.dat:
+ * html5lib/resources/tests20.dat:
+ * html5lib/resources/tests21.dat:
+ * html5lib/resources/tests9.dat:
+ * html5lib/resources/tests_innerHTML_1.dat:
+ * html5lib/runner-expected.txt:
+
2010-09-22 Dimitri Glazkov <dglazkov at chromium.org>
Reviewed by Adam Barth.
diff --git a/LayoutTests/html5lib/resources/comments01.dat b/LayoutTests/html5lib/resources/comments01.dat
index b0a89b8..44f1876 100644
--- a/LayoutTests/html5lib/resources/comments01.dat
+++ b/LayoutTests/html5lib/resources/comments01.dat
@@ -28,8 +28,7 @@ FOO<!-- BAR -- >BAZ
| <head>
| <body>
| "FOO"
-| <!-- BAR -- -->
-| "BAZ"
+| <!-- BAR -- >BAZ -->
#data
FOO<!-- BAR -- <QUX> -- MUX -->BAZ
@@ -61,8 +60,7 @@ FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
| <head>
| <body>
| "FOO"
-| <!-- BAR -- <QUX> -- MUX -- -->
-| "BAZ"
+| <!-- BAR -- <QUX> -- MUX -- >BAZ -->
#data
FOO<!---->BAZ
diff --git a/LayoutTests/html5lib/resources/pending-spec-changes-plain-text-unsafe.dat b/LayoutTests/html5lib/resources/pending-spec-changes-plain-text-unsafe.dat
new file mode 100644
index 0000000..af00e9d
Binary files /dev/null and b/LayoutTests/html5lib/resources/pending-spec-changes-plain-text-unsafe.dat differ
diff --git a/LayoutTests/html5lib/resources/pending-spec-changes.dat b/LayoutTests/html5lib/resources/pending-spec-changes.dat
new file mode 100644
index 0000000..4663c8b
--- /dev/null
+++ b/LayoutTests/html5lib/resources/pending-spec-changes.dat
@@ -0,0 +1,45 @@
+#data
+FOO<!-- BAR -- <QUX> -- MUX -- >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.
+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>
diff --git a/LayoutTests/html5lib/resources/plain-text-unsafe.dat b/LayoutTests/html5lib/resources/plain-text-unsafe.dat
new file mode 100644
index 0000000..2f40e83
--- /dev/null
+++ b/LayoutTests/html5lib/resources/plain-text-unsafe.dat
@@ -0,0 +1,8 @@
+#data
+FOO
ZOO
+#errors
+#document
+| <html>
+| <head>
+| <body>
+| "FOO
ZOO"
diff --git a/LayoutTests/html5lib/resources/tests1.dat b/LayoutTests/html5lib/resources/tests1.dat
index 6a11783..52d8d6b 100644
--- a/LayoutTests/html5lib/resources/tests1.dat
+++ b/LayoutTests/html5lib/resources/tests1.dat
@@ -1262,6 +1262,18 @@ Line: 1 Col: 49 Unexpected end tag (code). Ignored.
| <strike>
#data
+<!DOCTYPE html><spacer>foo
+#errors
+26: End of file seen and there were open elements.
+#document
+| <!DOCTYPE html>
+| <html>
+| <head>
+| <body>
+| <spacer>
+| "foo"
+
+#data
<title><meta></title><link><title><meta></title>
#errors
Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
diff --git a/LayoutTests/html5lib/resources/tests10.dat b/LayoutTests/html5lib/resources/tests10.dat
index 71a7600..7148faa 100644
--- a/LayoutTests/html5lib/resources/tests10.dat
+++ b/LayoutTests/html5lib/resources/tests10.dat
@@ -9,6 +9,18 @@
| <svg svg>
#data
+<!DOCTYPE html><svg></svg><![CDATA[a]]>
+#errors
+29: Bogus comment
+#document
+| <!DOCTYPE html>
+| <html>
+| <head>
+| <body>
+| <svg svg>
+| <!-- [CDATA[a]] -->
+
+#data
<!DOCTYPE html><body><svg></svg>
#errors
#document
@@ -502,6 +514,39 @@
| "a"
#data
+<!DOCTYPE html><svg><desc><div><svg><ul>a
+#errors
+40: HTML start tag “ul” in a foreign namespace context.
+41: End of file in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+| <head>
+| <body>
+| <svg svg>
+| <svg desc>
+| <div>
+| <svg svg>
+| <ul>
+| "a"
+
+#data
+<!DOCTYPE html><svg><desc><svg><ul>a
+#errors
+35: HTML start tag “ul” in a foreign namespace context.
+36: End of file in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+| <head>
+| <body>
+| <svg svg>
+| <svg desc>
+| <svg svg>
+| <ul>
+| "a"
+
+#data
<div><svg><path><foreignObject><p></foreignObject><p>
#errors
#document
@@ -725,4 +770,4 @@
| <math mo>
| <span>
| <svg path>
-| <math mi>
\ No newline at end of file
+| <math mi>
diff --git a/LayoutTests/html5lib/resources/tests13.dat b/LayoutTests/html5lib/resources/tests13.dat
deleted file mode 100644
index d180e8e..0000000
--- a/LayoutTests/html5lib/resources/tests13.dat
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<html><head>
-<title>404 Not Found</title>
-</head><body>
-<h1>Not Found</h1>
-<p>The requested URL /html5lib-tests/data/tests13.dat was not found on this server.</p>
-<p>Additionally, a 404 Not Found
-error was encountered while trying to use an ErrorDocument to handle the request.</p>
-</body></html>
diff --git a/LayoutTests/html5lib/resources/tests14.dat b/LayoutTests/html5lib/resources/tests14.dat
index 72f8015..b8713f8 100644
--- a/LayoutTests/html5lib/resources/tests14.dat
+++ b/LayoutTests/html5lib/resources/tests14.dat
@@ -71,4 +71,4 @@
| <html>
| <head>
| <body>
-| 789="012"
\ No newline at end of file
+| 789="012"
diff --git a/LayoutTests/html5lib/resources/tests15.dat b/LayoutTests/html5lib/resources/tests15.dat
index 7f016ca..6ce1c0d 100644
--- a/LayoutTests/html5lib/resources/tests15.dat
+++ b/LayoutTests/html5lib/resources/tests15.dat
@@ -205,4 +205,4 @@ XXX: These errors are wrong, please fix me!
| <html>
| <head>
| <body>
-| <object>
\ No newline at end of file
+| <object>
diff --git a/LayoutTests/html5lib/resources/tests17.dat b/LayoutTests/html5lib/resources/tests17.dat
index da59ef8..7b555f8 100644
--- a/LayoutTests/html5lib/resources/tests17.dat
+++ b/LayoutTests/html5lib/resources/tests17.dat
@@ -150,4 +150,4 @@
| <table>
| <tbody>
| <tr>
-| "a"
\ No newline at end of file
+| "a"
diff --git a/LayoutTests/html5lib/resources/tests19.dat b/LayoutTests/html5lib/resources/tests19.dat
index 085faae..06674ce 100644
--- a/LayoutTests/html5lib/resources/tests19.dat
+++ b/LayoutTests/html5lib/resources/tests19.dat
@@ -831,48 +831,6 @@
| "a "
#data
-<html>�<frameset></frameset>
-#errors
-#document
-| <html>
-| <head>
-| <frameset>
-
-#data
-<html> � <frameset></frameset>
-#errors
-#document
-| <html>
-| <head>
-| <frameset>
-
-#data
-<html>a�a<frameset></frameset>
-#errors
-#document
-| <html>
-| <head>
-| <body>
-| "a�a"
-
-#data
-<html>��<frameset></frameset>
-#errors
-#document
-| <html>
-| <head>
-| <frameset>
-
-#data
-<html>�
- <frameset></frameset>
-#errors
-#document
-| <html>
-| <head>
-| <frameset>
-
-#data
<!doctype html><p><math></p>a
#errors
#document
diff --git a/LayoutTests/html5lib/resources/tests20.dat b/LayoutTests/html5lib/resources/tests20.dat
index c4672eb..31e7b13 100644
--- a/LayoutTests/html5lib/resources/tests20.dat
+++ b/LayoutTests/html5lib/resources/tests20.dat
@@ -348,4 +348,4 @@
| <body>
| <svg svg>
| <svg title>
-| "abc"
\ No newline at end of file
+| "abc"
diff --git a/LayoutTests/html5lib/resources/tests21.dat b/LayoutTests/html5lib/resources/tests21.dat
index 1260ec0..9acc845 100644
--- a/LayoutTests/html5lib/resources/tests21.dat
+++ b/LayoutTests/html5lib/resources/tests21.dat
@@ -87,26 +87,6 @@
| "]] >"
#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/resources/tests9.dat b/LayoutTests/html5lib/resources/tests9.dat
index 2b715f8..554e27a 100644
--- a/LayoutTests/html5lib/resources/tests9.dat
+++ b/LayoutTests/html5lib/resources/tests9.dat
@@ -19,6 +19,33 @@
| <math math>
#data
+<!DOCTYPE html><math><mi>
+#errors
+25: End of file in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+| <head>
+| <body>
+| <math math>
+| <math mi>
+
+#data
+<!DOCTYPE html><math><annotation-xml><svg><u>
+#errors
+45: HTML start tag “u” in a foreign namespace context.
+45: End of file seen and there were open elements.
+#document
+| <!DOCTYPE html>
+| <html>
+| <head>
+| <body>
+| <math math>
+| <math annotation-xml>
+| <svg svg>
+| <u>
+
+#data
<!DOCTYPE html><body><select><math></math></select>
#errors
Line: 1 Col: 35 Unexpected start tag token (math) in the select phase. Ignored.
diff --git a/LayoutTests/html5lib/resources/tests_innerHTML_1.dat b/LayoutTests/html5lib/resources/tests_innerHTML_1.dat
index 718b36f..052fac7 100644
--- a/LayoutTests/html5lib/resources/tests_innerHTML_1.dat
+++ b/LayoutTests/html5lib/resources/tests_innerHTML_1.dat
@@ -730,4 +730,4 @@ html
#document-fragment
frameset
#document
-| <frame>
\ No newline at end of file
+| <frame>
diff --git a/LayoutTests/html5lib/runner-expected.txt b/LayoutTests/html5lib/runner-expected.txt
index 6f4d487..c4d0f90 100644
--- a/LayoutTests/html5lib/runner-expected.txt
+++ b/LayoutTests/html5lib/runner-expected.txt
@@ -9,6 +9,41 @@ CONSOLE MESSAGE: line 1: SyntaxError: Parse error
CONSOLE MESSAGE: line 1: SyntaxError: Parse error
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
+
+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
resources/tests2.dat: PASS
@@ -49,11 +84,11 @@ resources/tests8.dat: PASS
resources/tests9.dat: PASS
resources/tests10.dat:
-35
-48
-49
+38
+51
+52
-Test 35 of 49 in resources/tests10.dat failed. Input:
+Test 38 of 52 in resources/tests10.dat failed. Input:
<svg><script></script><path>
Got:
| <html>
@@ -70,7 +105,7 @@ Expected:
| <svg script>
| <svg path>
-Test 48 of 49 in resources/tests10.dat failed. Input:
+Test 51 of 52 in resources/tests10.dat failed. Input:
<math><annotation-xml><svg><foreignObject><div><math><mi></mi></math><span></span></div></foreignObject><path></path></svg></annotation-xml><mi>
Got:
| <html>
@@ -101,7 +136,7 @@ Expected:
| <svg path>
| <math mi>
-Test 49 of 49 in resources/tests10.dat failed. Input:
+Test 52 of 52 in resources/tests10.dat failed. Input:
<math><annotation-xml><svg><foreignObject><math><mi><svg></svg></mi><mo></mo></math><span></span></foreignObject><path></path></svg></annotation-xml><mi>
Got:
| <html>
@@ -150,7 +185,7 @@ resources/tests18.dat: PASS
resources/tests19.dat:
63
-Test 63 of 102 in resources/tests19.dat failed. Input:
+Test 63 of 97 in resources/tests19.dat failed. Input:
<!doctype html><keygen><frameset>
Got:
| <!DOCTYPE html>
@@ -190,41 +225,8 @@ resources/entities01.dat: PASS
resources/entities02.dat: PASS
-resources/comments01.dat:
-3
-6
+resources/comments01.dat: PASS
-Test 3 of 13 in resources/comments01.dat failed. Input:
-FOO<!-- BAR -- >BAZ
-Got:
-| <html>
-| <head>
-| <body>
-| "FOO"
-| <!-- BAR -- >BAZ -->
-Expected:
-| <html>
-| <head>
-| <body>
-| "FOO"
-| <!-- BAR -- -->
-| "BAZ"
-
-Test 6 of 13 in resources/comments01.dat failed. Input:
-FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
-Got:
-| <html>
-| <head>
-| <body>
-| "FOO"
-| <!-- BAR -- <QUX> -- MUX -- >BAZ -->
-Expected:
-| <html>
-| <head>
-| <body>
-| "FOO"
-| <!-- BAR -- <QUX> -- MUX -- -->
-| "BAZ"
resources/adoption01.dat: PASS
resources/adoption02.dat:
diff --git a/LayoutTests/html5lib/runner.html b/LayoutTests/html5lib/runner.html
index a616ec4..b54de4e 100644
--- a/LayoutTests/html5lib/runner.html
+++ b/LayoutTests/html5lib/runner.html
@@ -36,6 +36,9 @@ display: none;
Markup.noAutoDump();
var test_files = [
+ 'resources/pending-spec-changes-plain-text-unsafe.dat',
+ 'resources/pending-spec-changes.dat',
+ 'resources/plain-text-unsafe.dat',
'resources/tests1.dat',
'resources/tests2.dat',
'resources/tests3.dat',
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list