[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
commit-queue at webkit.org
commit-queue at webkit.org
Fri Jan 21 14:59:09 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit e117e2213ba8fef4eafaeb82a894177a4462ba14
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 5 23:38:35 2011 +0000
2011-01-05 Jenn Braithwaite <jennb at chromium.org>
Reviewed by Adam Barth.
fast/encoding/parser-tests.html is slow on debug builds
https://bugs.webkit.org/show_bug.cgi?id=51721
Break up parser tests to run 10 tests per batch.
* fast/encoding/parser-tests-10-expected.txt: Added.
* fast/encoding/parser-tests-10.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
* fast/encoding/parser-tests-100-expected.txt: Added.
* fast/encoding/parser-tests-100.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
* fast/encoding/parser-tests-110-expected.txt: Added.
* fast/encoding/parser-tests-110.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
* fast/encoding/parser-tests-120-expected.txt: Added.
* fast/encoding/parser-tests-120.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
* fast/encoding/parser-tests-20-expected.txt: Added.
* fast/encoding/parser-tests-20.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
* fast/encoding/parser-tests-30-expected.txt: Added.
* fast/encoding/parser-tests-30.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
* fast/encoding/parser-tests-40-expected.txt: Added.
* fast/encoding/parser-tests-40.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
* fast/encoding/parser-tests-50-expected.txt: Added.
* fast/encoding/parser-tests-50.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
* fast/encoding/parser-tests-60-expected.txt: Added.
* fast/encoding/parser-tests-60.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
* fast/encoding/parser-tests-70-expected.txt: Added.
* fast/encoding/parser-tests-70.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
* fast/encoding/parser-tests-80-expected.txt: Added.
* fast/encoding/parser-tests-80.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
* fast/encoding/parser-tests-90-expected.txt: Added.
* fast/encoding/parser-tests-90.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
* fast/encoding/parser-tests-expected.txt:
* fast/encoding/parser-tests.html:
* fast/encoding/resources/parser-tests.js: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75111 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 29295ee..01af5f3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,40 @@
+2011-01-05 Jenn Braithwaite <jennb at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ fast/encoding/parser-tests.html is slow on debug builds
+ https://bugs.webkit.org/show_bug.cgi?id=51721
+
+ Break up parser tests to run 10 tests per batch.
+
+ * fast/encoding/parser-tests-10-expected.txt: Added.
+ * fast/encoding/parser-tests-10.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
+ * fast/encoding/parser-tests-100-expected.txt: Added.
+ * fast/encoding/parser-tests-100.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
+ * fast/encoding/parser-tests-110-expected.txt: Added.
+ * fast/encoding/parser-tests-110.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
+ * fast/encoding/parser-tests-120-expected.txt: Added.
+ * fast/encoding/parser-tests-120.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
+ * fast/encoding/parser-tests-20-expected.txt: Added.
+ * fast/encoding/parser-tests-20.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
+ * fast/encoding/parser-tests-30-expected.txt: Added.
+ * fast/encoding/parser-tests-30.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
+ * fast/encoding/parser-tests-40-expected.txt: Added.
+ * fast/encoding/parser-tests-40.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
+ * fast/encoding/parser-tests-50-expected.txt: Added.
+ * fast/encoding/parser-tests-50.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
+ * fast/encoding/parser-tests-60-expected.txt: Added.
+ * fast/encoding/parser-tests-60.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
+ * fast/encoding/parser-tests-70-expected.txt: Added.
+ * fast/encoding/parser-tests-70.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
+ * fast/encoding/parser-tests-80-expected.txt: Added.
+ * fast/encoding/parser-tests-80.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
+ * fast/encoding/parser-tests-90-expected.txt: Added.
+ * fast/encoding/parser-tests-90.html: Copied from LayoutTests/fast/encoding/parser-tests.html.
+ * fast/encoding/parser-tests-expected.txt:
+ * fast/encoding/parser-tests.html:
+ * fast/encoding/resources/parser-tests.js: Added.
+
2011-01-05 Hans Wennborg <hans at chromium.org>
Reviewed by Jeremy Orlow.
diff --git a/LayoutTests/fast/encoding/parser-tests-10-expected.txt b/LayoutTests/fast/encoding/parser-tests-10-expected.txt
new file mode 100644
index 0000000..34a41e7
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-10-expected.txt
@@ -0,0 +1,15 @@
+This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+
+The suite has been broken up to run the tests in smaller batches.
+
+Expected failures:
+56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
+60 - parser treats meta inside style as text, not a tag.
+97, 99, 102 - we do not run scripts during encoding detection.
+Status: Tests ran.
+
+Serious failures:
+
+(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
+
+
diff --git a/LayoutTests/fast/encoding/parser-tests-10.html b/LayoutTests/fast/encoding/parser-tests-10.html
new file mode 100644
index 0000000..f9afb33
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-10.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Harness</title>
+ </head>
+ <body onload="runtests(10, 19)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
+ </body>
+</html>
diff --git a/LayoutTests/fast/encoding/parser-tests-100-expected.txt b/LayoutTests/fast/encoding/parser-tests-100-expected.txt
new file mode 100644
index 0000000..fb5c09b
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-100-expected.txt
@@ -0,0 +1,19 @@
+This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+
+The suite has been broken up to run the tests in smaller batches.
+
+Expected failures:
+56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
+60 - parser treats meta inside style as text, not a tag.
+97, 99, 102 - we do not run scripts during encoding detection.
+Status: Tests ran.
+
+Serious failures:
+
+test 102: expected Windows-1254; used Windows-1252
+<!DOCTYPE HTML>
+<script>document.write(atob('PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7Y2hhcnNldD1JU08tODg1OS05Ij4='))</script>
+<script>document.write(atob('PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7Y2hhcnNldD1JU08tODg1OS0xIj4='))</script>
+(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
+
+
diff --git a/LayoutTests/fast/encoding/parser-tests-100.html b/LayoutTests/fast/encoding/parser-tests-100.html
new file mode 100644
index 0000000..7e80b1c
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-100.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Harness</title>
+ </head>
+ <body onload="runtests(100, 109)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
+ </body>
+</html>
diff --git a/LayoutTests/fast/encoding/parser-tests-110-expected.txt b/LayoutTests/fast/encoding/parser-tests-110-expected.txt
new file mode 100644
index 0000000..34a41e7
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-110-expected.txt
@@ -0,0 +1,15 @@
+This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+
+The suite has been broken up to run the tests in smaller batches.
+
+Expected failures:
+56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
+60 - parser treats meta inside style as text, not a tag.
+97, 99, 102 - we do not run scripts during encoding detection.
+Status: Tests ran.
+
+Serious failures:
+
+(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
+
+
diff --git a/LayoutTests/fast/encoding/parser-tests-110.html b/LayoutTests/fast/encoding/parser-tests-110.html
new file mode 100644
index 0000000..eccd3d4
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-110.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Harness</title>
+ </head>
+ <body onload="runtests(110, 119)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
+ </body>
+</html>
diff --git a/LayoutTests/fast/encoding/parser-tests-120-expected.txt b/LayoutTests/fast/encoding/parser-tests-120-expected.txt
new file mode 100644
index 0000000..34a41e7
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-120-expected.txt
@@ -0,0 +1,15 @@
+This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+
+The suite has been broken up to run the tests in smaller batches.
+
+Expected failures:
+56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
+60 - parser treats meta inside style as text, not a tag.
+97, 99, 102 - we do not run scripts during encoding detection.
+Status: Tests ran.
+
+Serious failures:
+
+(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
+
+
diff --git a/LayoutTests/fast/encoding/parser-tests-120.html b/LayoutTests/fast/encoding/parser-tests-120.html
new file mode 100644
index 0000000..07691e8
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-120.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Harness</title>
+ </head>
+ <body onload="runtests(120, 123)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
+ </body>
+</html>
diff --git a/LayoutTests/fast/encoding/parser-tests-20-expected.txt b/LayoutTests/fast/encoding/parser-tests-20-expected.txt
new file mode 100644
index 0000000..34a41e7
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-20-expected.txt
@@ -0,0 +1,15 @@
+This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+
+The suite has been broken up to run the tests in smaller batches.
+
+Expected failures:
+56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
+60 - parser treats meta inside style as text, not a tag.
+97, 99, 102 - we do not run scripts during encoding detection.
+Status: Tests ran.
+
+Serious failures:
+
+(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
+
+
diff --git a/LayoutTests/fast/encoding/parser-tests-20.html b/LayoutTests/fast/encoding/parser-tests-20.html
new file mode 100644
index 0000000..5be5cbf
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-20.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Harness</title>
+ </head>
+ <body onload="runtests(20, 29)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
+ </body>
+</html>
diff --git a/LayoutTests/fast/encoding/parser-tests-30-expected.txt b/LayoutTests/fast/encoding/parser-tests-30-expected.txt
new file mode 100644
index 0000000..34a41e7
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-30-expected.txt
@@ -0,0 +1,15 @@
+This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+
+The suite has been broken up to run the tests in smaller batches.
+
+Expected failures:
+56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
+60 - parser treats meta inside style as text, not a tag.
+97, 99, 102 - we do not run scripts during encoding detection.
+Status: Tests ran.
+
+Serious failures:
+
+(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
+
+
diff --git a/LayoutTests/fast/encoding/parser-tests-30.html b/LayoutTests/fast/encoding/parser-tests-30.html
new file mode 100644
index 0000000..c2ff0ab
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-30.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Harness</title>
+ </head>
+ <body onload="runtests(30, 39)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
+ </body>
+</html>
diff --git a/LayoutTests/fast/encoding/parser-tests-40-expected.txt b/LayoutTests/fast/encoding/parser-tests-40-expected.txt
new file mode 100644
index 0000000..34a41e7
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-40-expected.txt
@@ -0,0 +1,15 @@
+This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+
+The suite has been broken up to run the tests in smaller batches.
+
+Expected failures:
+56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
+60 - parser treats meta inside style as text, not a tag.
+97, 99, 102 - we do not run scripts during encoding detection.
+Status: Tests ran.
+
+Serious failures:
+
+(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
+
+
diff --git a/LayoutTests/fast/encoding/parser-tests-40.html b/LayoutTests/fast/encoding/parser-tests-40.html
new file mode 100644
index 0000000..7c0b726
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-40.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Harness</title>
+ </head>
+ <body onload="runtests(40, 49)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
+ </body>
+</html>
diff --git a/LayoutTests/fast/encoding/parser-tests-50-expected.txt b/LayoutTests/fast/encoding/parser-tests-50-expected.txt
new file mode 100644
index 0000000..ace0646
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-50-expected.txt
@@ -0,0 +1,27 @@
+This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+
+The suite has been broken up to run the tests in smaller batches.
+
+Expected failures:
+56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
+60 - parser treats meta inside style as text, not a tag.
+97, 99, 102 - we do not run scripts during encoding detection.
+Status: Tests ran.
+
+Serious failures:
+
+test 056: expected Windows-1254; used Windows-1252
+<!DOCTYPE HTML>
+<script>document.write('<meta charset="ISO-8859-' + '9">')</script>
+test 057: expected Windows-1254; used Windows-1252
+<!DOCTYPE HTML>
+<script>var s = '9">'; document.write('<meta charset="ISO-8859-' + s)</script>
+test 058: expected Windows-1254; used Windows-1252
+<!DOCTYPE HTML>
+<script>document.write('<meta charset="ISO-8859-9">')</script>
+test 059: expected Windows-1254; used Windows-1252
+<!DOCTYPE HTML>
+<script type="text/plain"><meta charset="ISO-8859-9"></script>
+(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
+
+
diff --git a/LayoutTests/fast/encoding/parser-tests-50.html b/LayoutTests/fast/encoding/parser-tests-50.html
new file mode 100644
index 0000000..264461b
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-50.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Harness</title>
+ </head>
+ <body onload="runtests(50, 59)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
+ </body>
+</html>
diff --git a/LayoutTests/fast/encoding/parser-tests-60-expected.txt b/LayoutTests/fast/encoding/parser-tests-60-expected.txt
new file mode 100644
index 0000000..edb9453
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-60-expected.txt
@@ -0,0 +1,18 @@
+This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+
+The suite has been broken up to run the tests in smaller batches.
+
+Expected failures:
+56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
+60 - parser treats meta inside style as text, not a tag.
+97, 99, 102 - we do not run scripts during encoding detection.
+Status: Tests ran.
+
+Serious failures:
+
+test 060: expected Windows-1254; used Windows-1252
+<!DOCTYPE HTML>
+<style type="text/plain"><meta charset="ISO-8859-9"></style>
+(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
+
+
diff --git a/LayoutTests/fast/encoding/parser-tests-60.html b/LayoutTests/fast/encoding/parser-tests-60.html
new file mode 100644
index 0000000..deb3049
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-60.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Harness</title>
+ </head>
+ <body onload="runtests(60, 69)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
+ </body>
+</html>
diff --git a/LayoutTests/fast/encoding/parser-tests-70-expected.txt b/LayoutTests/fast/encoding/parser-tests-70-expected.txt
new file mode 100644
index 0000000..34a41e7
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-70-expected.txt
@@ -0,0 +1,15 @@
+This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+
+The suite has been broken up to run the tests in smaller batches.
+
+Expected failures:
+56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
+60 - parser treats meta inside style as text, not a tag.
+97, 99, 102 - we do not run scripts during encoding detection.
+Status: Tests ran.
+
+Serious failures:
+
+(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
+
+
diff --git a/LayoutTests/fast/encoding/parser-tests-70.html b/LayoutTests/fast/encoding/parser-tests-70.html
new file mode 100644
index 0000000..3120b90
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-70.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Harness</title>
+ </head>
+ <body onload="runtests(70, 79)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
+ </body>
+</html>
diff --git a/LayoutTests/fast/encoding/parser-tests-80-expected.txt b/LayoutTests/fast/encoding/parser-tests-80-expected.txt
new file mode 100644
index 0000000..34a41e7
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-80-expected.txt
@@ -0,0 +1,15 @@
+This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+
+The suite has been broken up to run the tests in smaller batches.
+
+Expected failures:
+56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
+60 - parser treats meta inside style as text, not a tag.
+97, 99, 102 - we do not run scripts during encoding detection.
+Status: Tests ran.
+
+Serious failures:
+
+(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
+
+
diff --git a/LayoutTests/fast/encoding/parser-tests-80.html b/LayoutTests/fast/encoding/parser-tests-80.html
new file mode 100644
index 0000000..e4a5feb
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-80.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Harness</title>
+ </head>
+ <body onload="runtests(80, 89)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
+ </body>
+</html>
diff --git a/LayoutTests/fast/encoding/parser-tests-90-expected.txt b/LayoutTests/fast/encoding/parser-tests-90-expected.txt
new file mode 100644
index 0000000..b2882a5
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-90-expected.txt
@@ -0,0 +1,22 @@
+This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+
+The suite has been broken up to run the tests in smaller batches.
+
+Expected failures:
+56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
+60 - parser treats meta inside style as text, not a tag.
+97, 99, 102 - we do not run scripts during encoding detection.
+Status: Tests ran.
+
+Serious failures:
+
+test 097: expected Windows-1254; used Windows-1252
+<!DOCTYPE HTML>
+<script>document.write(atob('PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7Y2hhcnNldD1JU08tODg1OS05Ij4='))</script>
+test 099: expected Windows-1252; used Windows-1254
+<!DOCTYPE HTML>
+<script>document.write(atob('PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7Y2hhcnNldD1JU08tODg1OS0xIj4='))</script>
+<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-9">
+(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
+
+
diff --git a/LayoutTests/fast/encoding/parser-tests-90.html b/LayoutTests/fast/encoding/parser-tests-90.html
new file mode 100644
index 0000000..012009b
--- /dev/null
+++ b/LayoutTests/fast/encoding/parser-tests-90.html
@@ -0,0 +1,9 @@
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <title>Harness</title>
+ </head>
+ <body onload="runtests(90, 99)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
+ </body>
+</html>
diff --git a/LayoutTests/fast/encoding/parser-tests-expected.txt b/LayoutTests/fast/encoding/parser-tests-expected.txt
index fb15ae2..34a41e7 100644
--- a/LayoutTests/fast/encoding/parser-tests-expected.txt
+++ b/LayoutTests/fast/encoding/parser-tests-expected.txt
@@ -1,5 +1,7 @@
This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html
+The suite has been broken up to run the tests in smaller batches.
+
Expected failures:
56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.
60 - parser treats meta inside style as text, not a tag.
@@ -8,32 +10,6 @@ Status: Tests ran.
Serious failures:
-test 056: expected Windows-1254; used Windows-1252
-<!DOCTYPE HTML>
-<script>document.write('<meta charset="ISO-8859-' + '9">')</script>
-test 057: expected Windows-1254; used Windows-1252
-<!DOCTYPE HTML>
-<script>var s = '9">'; document.write('<meta charset="ISO-8859-' + s)</script>
-test 058: expected Windows-1254; used Windows-1252
-<!DOCTYPE HTML>
-<script>document.write('<meta charset="ISO-8859-9">')</script>
-test 059: expected Windows-1254; used Windows-1252
-<!DOCTYPE HTML>
-<script type="text/plain"><meta charset="ISO-8859-9"></script>
-test 060: expected Windows-1254; used Windows-1252
-<!DOCTYPE HTML>
-<style type="text/plain"><meta charset="ISO-8859-9"></style>
-test 097: expected Windows-1254; used Windows-1252
-<!DOCTYPE HTML>
-<script>document.write(atob('PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7Y2hhcnNldD1JU08tODg1OS05Ij4='))</script>
-test 099: expected Windows-1252; used Windows-1254
-<!DOCTYPE HTML>
-<script>document.write(atob('PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7Y2hhcnNldD1JU08tODg1OS0xIj4='))</script>
-<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-9">
-test 102: expected Windows-1254; used Windows-1252
-<!DOCTYPE HTML>
-<script>document.write(atob('PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7Y2hhcnNldD1JU08tODg1OS05Ij4='))</script>
-<script>document.write(atob('PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7Y2hhcnNldD1JU08tODg1OS0xIj4='))</script>
(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)
diff --git a/LayoutTests/fast/encoding/parser-tests.html b/LayoutTests/fast/encoding/parser-tests.html
index fead50a..ab7fdf8 100644
--- a/LayoutTests/fast/encoding/parser-tests.html
+++ b/LayoutTests/fast/encoding/parser-tests.html
@@ -3,65 +3,7 @@
<head>
<title>Harness</title>
</head>
- <body onload="runtests()">
- <p>This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html</p>
- <ul>Expected failures:
- <li>56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.</li>
- <li>60 - parser treats meta inside style as text, not a tag.</li>
- <li>97, 99, 102 - we do not run scripts during encoding detection.</li>
- </ul>
- <p>Status: <span id="status">Tests did not run.</span></p>
- <p>Serious failures:</p>
- <ol id="failures">
- </ol>
- <p>(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)</p>
- <p><iframe id="test"></iframe></p>
- <script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
-
- var frame = document.getElementById('test');
- var current = 1;
- var max = 123;
- function dotest() {
- var s = current + '';
- while (s.length < 3) s = '0' + s;
- frame.src = 'resources/' + s + '.html';
- window.receivedResults = function () {
- var want = frame.contentWindow.document.getElementById('expected').firstChild.data;
- var have = frame.contentWindow.document.getElementById('encoding').firstChild.data;
- if (have == 'ISO-8859-9')
- have = 'Windows-1254';
- if (want != have) {
- var li = document.createElement('li');
- var a = document.createElement('a');
- a.appendChild(document.createTextNode('test ' + s));
- a.href = s + '.html';
- li.appendChild(a);
- li.appendChild(document.createTextNode(': expected ' + want + '; used ' + have));
- var pre = document.createElement('pre');
- pre.appendChild(document.createTextNode(frame.contentWindow.document.getElementsByTagName('pre')[0].firstChild.data));
- li.appendChild(pre);
- li.value = current;
- document.getElementById('failures').appendChild(li);
- }
- current += 1;
- if (current <= max)
- dotest();
- else {
- frame.parentNode.removeChild(frame);
- document.getElementById('status').innerText = "Tests ran.";
- if (window.layoutTestController)
- layoutTestController.notifyDone();
- }
- };
- }
- function runtests() {
- dotest();
- }
- function alert() { }
- </script>
+ <body onload="runtests(1, 9)">
+ <script type="text/javascript" src="resources/parser-tests.js"></script>
</body>
</html>
diff --git a/LayoutTests/fast/encoding/resources/parser-tests.js b/LayoutTests/fast/encoding/resources/parser-tests.js
new file mode 100644
index 0000000..fb55af9
--- /dev/null
+++ b/LayoutTests/fast/encoding/resources/parser-tests.js
@@ -0,0 +1,64 @@
+document.write('<p>This test suite was converted from http://www.hixie.ch/tests/adhoc/html/parsing/encoding/all.html</p>' +
+ '<p>The suite has been broken up to run the tests in smaller batches.</p>' +
+ '<ul>Expected failures:' +
+ '<li>56, 57, 58, 59 - we do not run scripts during encoding detection phase and parser treats meta inside a script as text, not a tag.</li>' +
+ '<li>60 - parser treats meta inside style as text, not a tag.</li>' +
+ '<li>97, 99, 102 - we do not run scripts during encoding detection.</li>' +
+ '</ul>' +
+ '<p>Status: <span id="status">Tests did not run.</span></p>' +
+ '<p>Serious failures:</p>' +
+ '<ol id="failures">' +
+ '</ol>' +
+ '<p>(Tests are considered to pass even if they treat Win1254 and ISO-8859-4 as separate.)</p>' +
+ '<p><iframe id="test"></iframe></p>');
+
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+}
+
+var frame = document.getElementById('test');
+var current = 0;
+var max = 0;
+
+function dotest() {
+ var s = current + '';
+ while (s.length < 3) s = '0' + s;
+ frame.src = 'resources/' + s + '.html';
+ window.receivedResults = function () {
+ var want = frame.contentWindow.document.getElementById('expected').firstChild.data;
+ var have = frame.contentWindow.document.getElementById('encoding').firstChild.data;
+ if (have == 'ISO-8859-9')
+ have = 'Windows-1254';
+ if (want != have) {
+ var li = document.createElement('li');
+ var a = document.createElement('a');
+ a.appendChild(document.createTextNode('test ' + s));
+ a.href = s + '.html';
+ li.appendChild(a);
+ li.appendChild(document.createTextNode(': expected ' + want + '; used ' + have));
+ var pre = document.createElement('pre');
+ pre.appendChild(document.createTextNode(frame.contentWindow.document.getElementsByTagName('pre')[0].firstChild.data));
+ li.appendChild(pre);
+ li.value = current;
+ document.getElementById('failures').appendChild(li);
+ }
+ current += 1;
+ if (current <= max)
+ dotest();
+ else {
+ frame.parentNode.removeChild(frame);
+ document.getElementById('status').innerText = "Tests ran.";
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
+ };
+}
+
+function runtests(c, m) {
+ current = c;
+ max = m;
+ dotest();
+}
+
+function alert() { }
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list