Layout Test Multiple html5lib/ tests are too slow and should be split.
https://bugs.webkit.org/show_bug.cgi?id=110734
Reviewed by Adam Barth.
Split all of the html5lib tests into write and data variants
instead of running both in sequence in each test.
I added a script to autogenerate all of the test harness files
from the *.dat files in resources/ (which we sync with the
upstream html5lib tests.
I removed all the old tests and expectations as well as TestExpectation entries.
All of these tests should now be fast enough to avoid timeout on all platforms.
I set the expectations from my chromium-linux (v8) machine, thus someone
from a jsc port will need to rebaseline appropriately from their machine.
* TestExpectations:
* html5lib/generate-test-wrappers.py: Added.
(WrapperGenerator):
(_files_in_directory_with_suffix):
(_last_path_component_removing_suffix):
(_remove_harness_prefix):
(_remove_harness_type):
(_test_name_from_harness_name):
(_remove_stale_tests):
(_input_path):
(_harness_path):
(_harness_content):
(_write_harness):
(main):
* html5lib/generated/run-adoption01-data-expected.txt: Added.
* html5lib/generated/run-adoption01-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-adoption01-write-expected.txt: Added.
* html5lib/generated/run-adoption01-write.html: Renamed from LayoutTests/html5lib/generated/run-template.html.
* html5lib/generated/run-adoption02-data-expected.txt: Added.
* html5lib/generated/run-adoption02-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-adoption02-write-expected.txt: Added.
* html5lib/generated/run-adoption02-write.html: Renamed from LayoutTests/html5lib/generated/run-tests11.html.
* html5lib/generated/run-comments01-data-expected.txt: Added.
* html5lib/generated/run-comments01-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-comments01-write-expected.txt: Added.
* html5lib/generated/run-comments01-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-doctype01-data-expected.txt: Added.
* html5lib/generated/run-doctype01-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-doctype01-write-expected.txt: Added.
* html5lib/generated/run-doctype01-write.html: Renamed from LayoutTests/html5lib/generated/run-tests10.html.
* html5lib/generated/run-domjs-unsafe-data-expected.txt: Added.
* html5lib/generated/run-domjs-unsafe-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-domjs-unsafe-write-expected.txt: Added.
* html5lib/generated/run-domjs-unsafe-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-entities01-data-expected.txt: Added.
* html5lib/generated/run-entities01-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-entities01-write-expected.txt: Added.
* html5lib/generated/run-entities01-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-entities02-data-expected.txt: Added.
* html5lib/generated/run-entities02-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-entities02-write-expected.txt: Added.
* html5lib/generated/run-entities02-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-html5test-com-data-expected.txt: Added.
* html5lib/generated/run-html5test-com-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-html5test-com-write-expected.txt: Added.
* html5lib/generated/run-html5test-com-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-inbody01-data-expected.txt: Added.
* html5lib/generated/run-inbody01-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-inbody01-write-expected.txt: Added.
* html5lib/generated/run-inbody01-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-isindex-data-expected.txt: Added.
* html5lib/generated/run-isindex-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-isindex-write-expected.txt: Added.
* html5lib/generated/run-isindex-write.html: Renamed from LayoutTests/html5lib/generated/run-tests2.html.
* html5lib/generated/run-pending-spec-changes-data-expected.txt: Added.
* html5lib/generated/run-pending-spec-changes-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-pending-spec-changes-plain-text-unsafe-data-expected.txt: Added.
* html5lib/generated/run-pending-spec-changes-plain-text-unsafe-data.html: Added.
* html5lib/generated/run-pending-spec-changes-plain-text-unsafe-write-expected.txt: Added.
* html5lib/generated/run-pending-spec-changes-plain-text-unsafe-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-pending-spec-changes-write-expected.txt: Added.
* html5lib/generated/run-pending-spec-changes-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-plain-text-unsafe-data-expected.txt: Added.
* html5lib/generated/run-plain-text-unsafe-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-plain-text-unsafe-write-expected.txt: Added.
* html5lib/generated/run-plain-text-unsafe-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-scriptdata01-data-expected.txt: Added.
* html5lib/generated/run-scriptdata01-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-scriptdata01-write-expected.txt: Added.
* html5lib/generated/run-scriptdata01-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tables01-data-expected.txt: Added.
* html5lib/generated/run-tables01-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tables01-write-expected.txt: Added.
* html5lib/generated/run-tables01-write.html: Renamed from LayoutTests/html5lib/generated/run-tests22.html.
* html5lib/generated/run-template-data-expected.txt: Added.
* html5lib/generated/run-template-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-template-expected.txt: Removed.
* html5lib/generated/run-template-write-expected.txt: Added.
* html5lib/generated/run-template-write.html: Renamed from LayoutTests/html5lib/generated/run-tests3.html.
* html5lib/generated/run-tests1-data-expected.txt: Added.
* html5lib/generated/run-tests1-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests1-expected.txt: Removed.
* html5lib/generated/run-tests1-write-expected.txt: Added.
* html5lib/generated/run-tests1-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests10-data-expected.txt: Added.
* html5lib/generated/run-tests10-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests10-expected.txt: Removed.
* html5lib/generated/run-tests10-write-expected.txt: Added.
* html5lib/generated/run-tests10-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests11-data-expected.txt: Added.
* html5lib/generated/run-tests11-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests11-expected.txt: Removed.
* html5lib/generated/run-tests11-write-expected.txt: Added.
* html5lib/generated/run-tests11-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests12-data-expected.txt: Added.
* html5lib/generated/run-tests12-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests12-expected.txt: Removed.
* html5lib/generated/run-tests12-write-expected.txt: Added.
* html5lib/generated/run-tests12-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests12.html: Removed.
* html5lib/generated/run-tests14-data-expected.txt: Added.
* html5lib/generated/run-tests14-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests14-expected.txt: Removed.
* html5lib/generated/run-tests14-write-expected.txt: Added.
* html5lib/generated/run-tests14-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests14.html: Removed.
* html5lib/generated/run-tests15-data-expected.txt: Added.
* html5lib/generated/run-tests15-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests15-expected.txt: Removed.
* html5lib/generated/run-tests15-write-expected.txt: Added.
* html5lib/generated/run-tests15-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests15.html: Removed.
* html5lib/generated/run-tests16-data-expected.txt: Added.
* html5lib/generated/run-tests16-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests16-expected.txt: Removed.
* html5lib/generated/run-tests16-write-expected.txt: Added.
* html5lib/generated/run-tests16-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests16.html: Removed.
* html5lib/generated/run-tests17-data-expected.txt: Added.
* html5lib/generated/run-tests17-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests17-expected.txt: Removed.
* html5lib/generated/run-tests17-write-expected.txt: Added.
* html5lib/generated/run-tests17-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests17.html: Removed.
* html5lib/generated/run-tests18-data-expected.txt: Added.
* html5lib/generated/run-tests18-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests18-expected.txt: Removed.
* html5lib/generated/run-tests18-write-expected.txt: Added.
* html5lib/generated/run-tests18-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests18.html: Removed.
* html5lib/generated/run-tests19-data-expected.txt: Added.
* html5lib/generated/run-tests19-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests19-expected.txt: Removed.
* html5lib/generated/run-tests19-write-expected.txt: Added.
* html5lib/generated/run-tests19-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests19.html: Removed.
* html5lib/generated/run-tests2-data-expected.txt: Added.
* html5lib/generated/run-tests2-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests2-expected.txt: Removed.
* html5lib/generated/run-tests2-write-expected.txt: Added.
* html5lib/generated/run-tests2-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests20-data-expected.txt: Added.
* html5lib/generated/run-tests20-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests20-expected.txt: Removed.
* html5lib/generated/run-tests20-write-expected.txt: Added.
* html5lib/generated/run-tests20-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests20.html: Removed.
* html5lib/generated/run-tests21-data-expected.txt: Added.
* html5lib/generated/run-tests21-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests21-expected.txt: Removed.
* html5lib/generated/run-tests21-write-expected.txt: Added.
* html5lib/generated/run-tests21-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests21.html: Removed.
* html5lib/generated/run-tests22-data-expected.txt: Added.
* html5lib/generated/run-tests22-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests22-expected.txt: Removed.
* html5lib/generated/run-tests22-write-expected.txt: Added.
* html5lib/generated/run-tests22-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests23-data-expected.txt: Added.
* html5lib/generated/run-tests23-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests23-expected.txt: Removed.
* html5lib/generated/run-tests23-write-expected.txt: Added.
* html5lib/generated/run-tests23-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests23.html: Removed.
* html5lib/generated/run-tests24-data-expected.txt: Added.
* html5lib/generated/run-tests24-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests24-expected.txt: Removed.
* html5lib/generated/run-tests24-write-expected.txt: Added.
* html5lib/generated/run-tests24-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests24.html: Removed.
* html5lib/generated/run-tests25-data-expected.txt: Added.
* html5lib/generated/run-tests25-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests25-expected.txt: Removed.
* html5lib/generated/run-tests25-write-expected.txt: Added.
* html5lib/generated/run-tests25-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests25.html: Removed.
* html5lib/generated/run-tests26-data-expected.txt: Added.
* html5lib/generated/run-tests26-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests26-expected.txt: Removed.
* html5lib/generated/run-tests26-write-expected.txt: Added.
* html5lib/generated/run-tests26-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests26.html: Removed.
* html5lib/generated/run-tests3-data-expected.txt: Added.
* html5lib/generated/run-tests3-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests3-expected.txt: Removed.
* html5lib/generated/run-tests3-write-expected.txt: Added.
* html5lib/generated/run-tests3-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests4-data-expected.txt: Added.
* html5lib/generated/run-tests4-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests4-expected.txt: Removed.
* html5lib/generated/run-tests4-write-expected.txt: Added.
* html5lib/generated/run-tests4-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests4.html: Removed.
* html5lib/generated/run-tests5-data-expected.txt: Added.
* html5lib/generated/run-tests5-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests5-expected.txt: Removed.
* html5lib/generated/run-tests5-write-expected.txt: Added.
* html5lib/generated/run-tests5-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests5.html: Removed.
* html5lib/generated/run-tests6-data-expected.txt: Added.
* html5lib/generated/run-tests6-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests6-expected.txt: Removed.
* html5lib/generated/run-tests6-write-expected.txt: Added.
* html5lib/generated/run-tests6-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests6.html: Removed.
* html5lib/generated/run-tests7-data-expected.txt: Added.
* html5lib/generated/run-tests7-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests7-expected.txt: Removed.
* html5lib/generated/run-tests7-write-expected.txt: Added.
* html5lib/generated/run-tests7-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests7.html: Removed.
* html5lib/generated/run-tests8-data-expected.txt: Added.
* html5lib/generated/run-tests8-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests8-expected.txt: Removed.
* html5lib/generated/run-tests8-write-expected.txt: Added.
* html5lib/generated/run-tests8-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests8.html: Removed.
* html5lib/generated/run-tests9-data-expected.txt: Added.
* html5lib/generated/run-tests9-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests9-expected.txt: Removed.
* html5lib/generated/run-tests9-write-expected.txt: Added.
* html5lib/generated/run-tests9-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests9.html: Removed.
* html5lib/generated/run-tests_innerHTML_1-data-expected.txt: Added.
* html5lib/generated/run-tests_innerHTML_1-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tests_innerHTML_1-write-expected.txt: Added.
* html5lib/generated/run-tests_innerHTML_1-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tricky01-data-expected.txt: Added.
* html5lib/generated/run-tricky01-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-tricky01-write-expected.txt: Added.
* html5lib/generated/run-tricky01-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-webkit01-data-expected.txt: Added.
* html5lib/generated/run-webkit01-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-webkit01-write-expected.txt: Added.
* html5lib/generated/run-webkit01-write.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-webkit02-data-expected.txt: Added.
* html5lib/generated/run-webkit02-data.html: Copied from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/generated/run-webkit02-write-expected.txt: Added.
* html5lib/generated/run-webkit02-write.html: Renamed from LayoutTests/html5lib/generated/run-tests1.html.
* html5lib/resources/runner.js:
(window.onload):
* html5lib/runner-expected.txt: Removed.
* html5lib/runner.html: Removed.
* platform/chromium/TestExpectations:
* platform/chromium/html5lib/generated/run-tests1-expected.txt: Removed.
* platform/chromium/html5lib/generated/run-tests18-expected.txt: Removed.
* platform/chromium/html5lib/generated/run-tests7-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@144032 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/html5lib/generated/run-adoption01-data-expected.txt b/LayoutTests/html5lib/generated/run-adoption01-data-expected.txt
new file mode 100644
index 0000000..cc84c78
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-adoption01-data-expected.txt
@@ -0,0 +1,57 @@
+../resources/adoption01.dat:
+14
+
+Test 14 of 17 in ../resources/adoption01.dat failed. Input:
+<div><a><b><div><div><div><div><div><div><div><div><div><div></a>
+Got:
+| <html>
+| <head>
+| <body>
+| <div>
+| <a>
+| <b>
+| <b>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <div>
+Expected:
+| <html>
+| <head>
+| <body>
+| <div>
+| <a>
+| <b>
+| <b>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <div>
diff --git a/LayoutTests/html5lib/generated/run-adoption01-data.html b/LayoutTests/html5lib/generated/run-adoption01-data.html
new file mode 100644
index 0000000..3ad6cd7
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-adoption01-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/adoption01.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-adoption01-write-expected.txt b/LayoutTests/html5lib/generated/run-adoption01-write-expected.txt
new file mode 100644
index 0000000..cc84c78
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-adoption01-write-expected.txt
@@ -0,0 +1,57 @@
+../resources/adoption01.dat:
+14
+
+Test 14 of 17 in ../resources/adoption01.dat failed. Input:
+<div><a><b><div><div><div><div><div><div><div><div><div><div></a>
+Got:
+| <html>
+| <head>
+| <body>
+| <div>
+| <a>
+| <b>
+| <b>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <div>
+Expected:
+| <html>
+| <head>
+| <body>
+| <div>
+| <a>
+| <b>
+| <b>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <a>
+| <div>
+| <div>
diff --git a/LayoutTests/html5lib/generated/run-tests18.html b/LayoutTests/html5lib/generated/run-adoption01-write.html
similarity index 64%
copy from LayoutTests/html5lib/generated/run-tests18.html
copy to LayoutTests/html5lib/generated/run-adoption01-write.html
index f1274ca..ce41bba 100644
--- a/LayoutTests/html5lib/generated/run-tests18.html
+++ b/LayoutTests/html5lib/generated/run-adoption01-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests18.dat',
-]
+var test_files = [ '../resources/adoption01.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-adoption02-data-expected.txt b/LayoutTests/html5lib/generated/run-adoption02-data-expected.txt
new file mode 100644
index 0000000..f38edb6
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-adoption02-data-expected.txt
@@ -0,0 +1 @@
+../resources/adoption02.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-adoption02-data.html b/LayoutTests/html5lib/generated/run-adoption02-data.html
new file mode 100644
index 0000000..6ef7768
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-adoption02-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/adoption02.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-adoption02-write-expected.txt b/LayoutTests/html5lib/generated/run-adoption02-write-expected.txt
new file mode 100644
index 0000000..f38edb6
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-adoption02-write-expected.txt
@@ -0,0 +1 @@
+../resources/adoption02.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18.html b/LayoutTests/html5lib/generated/run-adoption02-write.html
similarity index 64%
rename from LayoutTests/html5lib/generated/run-tests18.html
rename to LayoutTests/html5lib/generated/run-adoption02-write.html
index f1274ca..de63120 100644
--- a/LayoutTests/html5lib/generated/run-tests18.html
+++ b/LayoutTests/html5lib/generated/run-adoption02-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests18.dat',
-]
+var test_files = [ '../resources/adoption02.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-comments01-data-expected.txt b/LayoutTests/html5lib/generated/run-comments01-data-expected.txt
new file mode 100644
index 0000000..42b2ae5
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-comments01-data-expected.txt
@@ -0,0 +1 @@
+../resources/comments01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-comments01-data.html b/LayoutTests/html5lib/generated/run-comments01-data.html
new file mode 100644
index 0000000..cc32d37
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-comments01-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/comments01.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-comments01-write-expected.txt b/LayoutTests/html5lib/generated/run-comments01-write-expected.txt
new file mode 100644
index 0000000..42b2ae5
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-comments01-write-expected.txt
@@ -0,0 +1 @@
+../resources/comments01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18.html b/LayoutTests/html5lib/generated/run-comments01-write.html
similarity index 64%
copy from LayoutTests/html5lib/generated/run-tests18.html
copy to LayoutTests/html5lib/generated/run-comments01-write.html
index f1274ca..94cbe37 100644
--- a/LayoutTests/html5lib/generated/run-tests18.html
+++ b/LayoutTests/html5lib/generated/run-comments01-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests18.dat',
-]
+var test_files = [ '../resources/comments01.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-doctype01-data-expected.txt b/LayoutTests/html5lib/generated/run-doctype01-data-expected.txt
new file mode 100644
index 0000000..bd34a57
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-doctype01-data-expected.txt
@@ -0,0 +1 @@
+../resources/doctype01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-doctype01-data.html b/LayoutTests/html5lib/generated/run-doctype01-data.html
new file mode 100644
index 0000000..c4ab2ec
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-doctype01-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/doctype01.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-doctype01-write-expected.txt b/LayoutTests/html5lib/generated/run-doctype01-write-expected.txt
new file mode 100644
index 0000000..bd34a57
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-doctype01-write-expected.txt
@@ -0,0 +1 @@
+../resources/doctype01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18.html b/LayoutTests/html5lib/generated/run-doctype01-write.html
similarity index 64%
copy from LayoutTests/html5lib/generated/run-tests18.html
copy to LayoutTests/html5lib/generated/run-doctype01-write.html
index f1274ca..034ce9c 100644
--- a/LayoutTests/html5lib/generated/run-tests18.html
+++ b/LayoutTests/html5lib/generated/run-doctype01-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests18.dat',
-]
+var test_files = [ '../resources/doctype01.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-domjs-unsafe-data-expected.txt b/LayoutTests/html5lib/generated/run-domjs-unsafe-data-expected.txt
new file mode 100644
index 0000000..3de784f
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-domjs-unsafe-data-expected.txt
@@ -0,0 +1 @@
+../resources/domjs-unsafe.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-domjs-unsafe-data.html b/LayoutTests/html5lib/generated/run-domjs-unsafe-data.html
new file mode 100644
index 0000000..15c2368
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-domjs-unsafe-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/domjs-unsafe.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-domjs-unsafe-write-expected.txt b/LayoutTests/html5lib/generated/run-domjs-unsafe-write-expected.txt
new file mode 100644
index 0000000..3de784f
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-domjs-unsafe-write-expected.txt
@@ -0,0 +1 @@
+../resources/domjs-unsafe.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18.html b/LayoutTests/html5lib/generated/run-domjs-unsafe-write.html
similarity index 63%
copy from LayoutTests/html5lib/generated/run-tests18.html
copy to LayoutTests/html5lib/generated/run-domjs-unsafe-write.html
index f1274ca..2a231c1 100644
--- a/LayoutTests/html5lib/generated/run-tests18.html
+++ b/LayoutTests/html5lib/generated/run-domjs-unsafe-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests18.dat',
-]
+var test_files = [ '../resources/domjs-unsafe.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-entities01-data-expected.txt b/LayoutTests/html5lib/generated/run-entities01-data-expected.txt
new file mode 100644
index 0000000..94ebb7c
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-entities01-data-expected.txt
@@ -0,0 +1 @@
+../resources/entities01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-entities01-data.html b/LayoutTests/html5lib/generated/run-entities01-data.html
new file mode 100644
index 0000000..c45c957
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-entities01-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/entities01.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-entities01-write-expected.txt b/LayoutTests/html5lib/generated/run-entities01-write-expected.txt
new file mode 100644
index 0000000..94ebb7c
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-entities01-write-expected.txt
@@ -0,0 +1 @@
+../resources/entities01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18.html b/LayoutTests/html5lib/generated/run-entities01-write.html
similarity index 64%
copy from LayoutTests/html5lib/generated/run-tests18.html
copy to LayoutTests/html5lib/generated/run-entities01-write.html
index f1274ca..1fe0e82 100644
--- a/LayoutTests/html5lib/generated/run-tests18.html
+++ b/LayoutTests/html5lib/generated/run-entities01-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests18.dat',
-]
+var test_files = [ '../resources/entities01.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-entities02-data-expected.txt b/LayoutTests/html5lib/generated/run-entities02-data-expected.txt
new file mode 100644
index 0000000..1115fd3
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-entities02-data-expected.txt
@@ -0,0 +1 @@
+../resources/entities02.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-entities02-data.html b/LayoutTests/html5lib/generated/run-entities02-data.html
new file mode 100644
index 0000000..b05c39b9
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-entities02-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/entities02.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-entities02-write-expected.txt b/LayoutTests/html5lib/generated/run-entities02-write-expected.txt
new file mode 100644
index 0000000..1115fd3
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-entities02-write-expected.txt
@@ -0,0 +1 @@
+../resources/entities02.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18.html b/LayoutTests/html5lib/generated/run-entities02-write.html
similarity index 64%
copy from LayoutTests/html5lib/generated/run-tests18.html
copy to LayoutTests/html5lib/generated/run-entities02-write.html
index f1274ca..1ad9db5 100644
--- a/LayoutTests/html5lib/generated/run-tests18.html
+++ b/LayoutTests/html5lib/generated/run-entities02-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests18.dat',
-]
+var test_files = [ '../resources/entities02.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-html5test-com-data-expected.txt b/LayoutTests/html5lib/generated/run-html5test-com-data-expected.txt
new file mode 100644
index 0000000..d059aa9
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-html5test-com-data-expected.txt
@@ -0,0 +1 @@
+../resources/html5test-com.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-html5test-com-data.html b/LayoutTests/html5lib/generated/run-html5test-com-data.html
new file mode 100644
index 0000000..5bfc5da
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-html5test-com-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/html5test-com.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-html5test-com-write-expected.txt b/LayoutTests/html5lib/generated/run-html5test-com-write-expected.txt
new file mode 100644
index 0000000..d059aa9
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-html5test-com-write-expected.txt
@@ -0,0 +1 @@
+../resources/html5test-com.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18.html b/LayoutTests/html5lib/generated/run-html5test-com-write.html
similarity index 63%
copy from LayoutTests/html5lib/generated/run-tests18.html
copy to LayoutTests/html5lib/generated/run-html5test-com-write.html
index f1274ca..511924b 100644
--- a/LayoutTests/html5lib/generated/run-tests18.html
+++ b/LayoutTests/html5lib/generated/run-html5test-com-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests18.dat',
-]
+var test_files = [ '../resources/html5test-com.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-inbody01-data-expected.txt b/LayoutTests/html5lib/generated/run-inbody01-data-expected.txt
new file mode 100644
index 0000000..5475ff1
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-inbody01-data-expected.txt
@@ -0,0 +1 @@
+../resources/inbody01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-inbody01-data.html b/LayoutTests/html5lib/generated/run-inbody01-data.html
new file mode 100644
index 0000000..c535ac4
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-inbody01-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/inbody01.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-inbody01-write-expected.txt b/LayoutTests/html5lib/generated/run-inbody01-write-expected.txt
new file mode 100644
index 0000000..5475ff1
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-inbody01-write-expected.txt
@@ -0,0 +1 @@
+../resources/inbody01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-inbody01-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-inbody01-write.html
index c15c4c5..139a816 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-inbody01-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/inbody01.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-isindex-data-expected.txt b/LayoutTests/html5lib/generated/run-isindex-data-expected.txt
new file mode 100644
index 0000000..2322052
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-isindex-data-expected.txt
@@ -0,0 +1 @@
+../resources/isindex.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-isindex-data.html b/LayoutTests/html5lib/generated/run-isindex-data.html
new file mode 100644
index 0000000..aeaff00
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-isindex-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/isindex.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-isindex-write-expected.txt b/LayoutTests/html5lib/generated/run-isindex-write-expected.txt
new file mode 100644
index 0000000..2322052
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-isindex-write-expected.txt
@@ -0,0 +1 @@
+../resources/isindex.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-isindex-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-isindex-write.html
index c15c4c5..baec4c8 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-isindex-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/isindex.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-pending-spec-changes-data-expected.txt b/LayoutTests/html5lib/generated/run-pending-spec-changes-data-expected.txt
new file mode 100644
index 0000000..0ae0507
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-pending-spec-changes-data-expected.txt
@@ -0,0 +1 @@
+../resources/pending-spec-changes.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-pending-spec-changes-data.html b/LayoutTests/html5lib/generated/run-pending-spec-changes-data.html
new file mode 100644
index 0000000..ee43d22
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-pending-spec-changes-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/pending-spec-changes.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-pending-spec-changes-plain-text-unsafe-data-expected.txt b/LayoutTests/html5lib/generated/run-pending-spec-changes-plain-text-unsafe-data-expected.txt
new file mode 100644
index 0000000..8e73312
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-pending-spec-changes-plain-text-unsafe-data-expected.txt
@@ -0,0 +1 @@
+../resources/pending-spec-changes-plain-text-unsafe.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-pending-spec-changes-plain-text-unsafe-data.html b/LayoutTests/html5lib/generated/run-pending-spec-changes-plain-text-unsafe-data.html
new file mode 100644
index 0000000..99884a3
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-pending-spec-changes-plain-text-unsafe-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/pending-spec-changes-plain-text-unsafe.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-pending-spec-changes-plain-text-unsafe-write-expected.txt b/LayoutTests/html5lib/generated/run-pending-spec-changes-plain-text-unsafe-write-expected.txt
new file mode 100644
index 0000000..8e73312
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-pending-spec-changes-plain-text-unsafe-write-expected.txt
@@ -0,0 +1 @@
+../resources/pending-spec-changes-plain-text-unsafe.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-pending-spec-changes-plain-text-unsafe-write.html b/LayoutTests/html5lib/generated/run-pending-spec-changes-plain-text-unsafe-write.html
new file mode 100644
index 0000000..aefda7d
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-pending-spec-changes-plain-text-unsafe-write.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/pending-spec-changes-plain-text-unsafe.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-pending-spec-changes-write-expected.txt b/LayoutTests/html5lib/generated/run-pending-spec-changes-write-expected.txt
new file mode 100644
index 0000000..0ae0507
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-pending-spec-changes-write-expected.txt
@@ -0,0 +1 @@
+../resources/pending-spec-changes.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18.html b/LayoutTests/html5lib/generated/run-pending-spec-changes-write.html
similarity index 61%
copy from LayoutTests/html5lib/generated/run-tests18.html
copy to LayoutTests/html5lib/generated/run-pending-spec-changes-write.html
index f1274ca..34a9fcd 100644
--- a/LayoutTests/html5lib/generated/run-tests18.html
+++ b/LayoutTests/html5lib/generated/run-pending-spec-changes-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests18.dat',
-]
+var test_files = [ '../resources/pending-spec-changes.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-plain-text-unsafe-data-expected.txt b/LayoutTests/html5lib/generated/run-plain-text-unsafe-data-expected.txt
new file mode 100644
index 0000000..148d19a
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-plain-text-unsafe-data-expected.txt
@@ -0,0 +1 @@
+../resources/plain-text-unsafe.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-plain-text-unsafe-data.html b/LayoutTests/html5lib/generated/run-plain-text-unsafe-data.html
new file mode 100644
index 0000000..75550e4
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-plain-text-unsafe-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/plain-text-unsafe.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-plain-text-unsafe-write-expected.txt b/LayoutTests/html5lib/generated/run-plain-text-unsafe-write-expected.txt
new file mode 100644
index 0000000..148d19a
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-plain-text-unsafe-write-expected.txt
@@ -0,0 +1 @@
+../resources/plain-text-unsafe.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18.html b/LayoutTests/html5lib/generated/run-plain-text-unsafe-write.html
similarity index 62%
copy from LayoutTests/html5lib/generated/run-tests18.html
copy to LayoutTests/html5lib/generated/run-plain-text-unsafe-write.html
index f1274ca..12eeec7 100644
--- a/LayoutTests/html5lib/generated/run-tests18.html
+++ b/LayoutTests/html5lib/generated/run-plain-text-unsafe-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests18.dat',
-]
+var test_files = [ '../resources/plain-text-unsafe.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-scriptdata01-data-expected.txt b/LayoutTests/html5lib/generated/run-scriptdata01-data-expected.txt
new file mode 100644
index 0000000..430e499
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-scriptdata01-data-expected.txt
@@ -0,0 +1 @@
+../resources/scriptdata01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-scriptdata01-data.html b/LayoutTests/html5lib/generated/run-scriptdata01-data.html
new file mode 100644
index 0000000..d818aa4
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-scriptdata01-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/scriptdata01.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-scriptdata01-write-expected.txt b/LayoutTests/html5lib/generated/run-scriptdata01-write-expected.txt
new file mode 100644
index 0000000..430e499
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-scriptdata01-write-expected.txt
@@ -0,0 +1 @@
+../resources/scriptdata01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18.html b/LayoutTests/html5lib/generated/run-scriptdata01-write.html
similarity index 63%
copy from LayoutTests/html5lib/generated/run-tests18.html
copy to LayoutTests/html5lib/generated/run-scriptdata01-write.html
index f1274ca..6b55eac 100644
--- a/LayoutTests/html5lib/generated/run-tests18.html
+++ b/LayoutTests/html5lib/generated/run-scriptdata01-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests18.dat',
-]
+var test_files = [ '../resources/scriptdata01.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tables01-data-expected.txt b/LayoutTests/html5lib/generated/run-tables01-data-expected.txt
new file mode 100644
index 0000000..3a76fe6
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tables01-data-expected.txt
@@ -0,0 +1 @@
+../resources/tables01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tables01-data.html b/LayoutTests/html5lib/generated/run-tables01-data.html
new file mode 100644
index 0000000..4642358
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tables01-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tables01.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tables01-write-expected.txt b/LayoutTests/html5lib/generated/run-tables01-write-expected.txt
new file mode 100644
index 0000000..3a76fe6
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tables01-write-expected.txt
@@ -0,0 +1 @@
+../resources/tables01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tables01-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tables01-write.html
index c15c4c5..d91f660 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tables01-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tables01.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-template-data-expected.txt b/LayoutTests/html5lib/generated/run-template-data-expected.txt
new file mode 100644
index 0000000..c2c11ed
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-template-data-expected.txt
@@ -0,0 +1 @@
+../resources/template.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-template-data.html b/LayoutTests/html5lib/generated/run-template-data.html
new file mode 100644
index 0000000..be36cb3
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-template-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/template.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-template-expected.txt b/LayoutTests/html5lib/generated/run-template-expected.txt
deleted file mode 100644
index 247e47e..0000000
--- a/LayoutTests/html5lib/generated/run-template-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/template.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/template.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-template-write-expected.txt b/LayoutTests/html5lib/generated/run-template-write-expected.txt
new file mode 100644
index 0000000..c2c11ed
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-template-write-expected.txt
@@ -0,0 +1 @@
+../resources/template.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-template-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-template-write.html
index c15c4c5..df02239 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-template-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/template.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-template.html b/LayoutTests/html5lib/generated/run-template.html
deleted file mode 100644
index d109c6f..0000000
--- a/LayoutTests/html5lib/generated/run-template.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/template.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests1-data-expected.txt b/LayoutTests/html5lib/generated/run-tests1-data-expected.txt
new file mode 100644
index 0000000..f11a070
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests1-data-expected.txt
@@ -0,0 +1,2 @@
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token <
+../resources/tests1.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests1-data.html b/LayoutTests/html5lib/generated/run-tests1-data.html
new file mode 100644
index 0000000..6ca9b1f
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests1-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests1.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests1-expected.txt b/LayoutTests/html5lib/generated/run-tests1-expected.txt
deleted file mode 100644
index 52049da..0000000
--- a/LayoutTests/html5lib/generated/run-tests1-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token '<'
-CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token '<'
-../resources/tests1.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests1.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests1-write-expected.txt b/LayoutTests/html5lib/generated/run-tests1-write-expected.txt
new file mode 100644
index 0000000..f11a070
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests1-write-expected.txt
@@ -0,0 +1,2 @@
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token <
+../resources/tests1.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests1-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests1-write.html
index c15c4c5..4006030 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests1-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests1.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests1.html b/LayoutTests/html5lib/generated/run-tests1.html
deleted file mode 100644
index d46c56d..0000000
--- a/LayoutTests/html5lib/generated/run-tests1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests1.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests10-data-expected.txt b/LayoutTests/html5lib/generated/run-tests10-data-expected.txt
new file mode 100644
index 0000000..b5b1c51
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests10-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests10.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests10-data.html b/LayoutTests/html5lib/generated/run-tests10-data.html
new file mode 100644
index 0000000..d52adba
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests10-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests10.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests10-expected.txt b/LayoutTests/html5lib/generated/run-tests10-expected.txt
deleted file mode 100644
index 03af961..0000000
--- a/LayoutTests/html5lib/generated/run-tests10-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests10.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests10.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests10-write-expected.txt b/LayoutTests/html5lib/generated/run-tests10-write-expected.txt
new file mode 100644
index 0000000..b5b1c51
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests10-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests10.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests10-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests10-write.html
index c15c4c5..84e52e6 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests10-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests10.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests10.html b/LayoutTests/html5lib/generated/run-tests10.html
deleted file mode 100644
index c8557d1..0000000
--- a/LayoutTests/html5lib/generated/run-tests10.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests10.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests11-data-expected.txt b/LayoutTests/html5lib/generated/run-tests11-data-expected.txt
new file mode 100644
index 0000000..176b5c0
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests11-data-expected.txt
@@ -0,0 +1,4 @@
+CONSOLE MESSAGE: line 1: Warning: Problem parsing viewBox=""
+CONSOLE MESSAGE: line 1: Warning: Problem parsing viewBox=""
+CONSOLE MESSAGE: line 1: Warning: Problem parsing viewBox=""
+../resources/tests11.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests11-data.html b/LayoutTests/html5lib/generated/run-tests11-data.html
new file mode 100644
index 0000000..58e3b184
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests11-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests11.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests11-expected.txt b/LayoutTests/html5lib/generated/run-tests11-expected.txt
deleted file mode 100644
index 800a032..0000000
--- a/LayoutTests/html5lib/generated/run-tests11-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-CONSOLE MESSAGE: Warning: Problem parsing viewBox=""
-CONSOLE MESSAGE: Warning: Problem parsing viewBox=""
-CONSOLE MESSAGE: Warning: Problem parsing viewBox=""
-CONSOLE MESSAGE: line 1: Warning: Problem parsing viewBox=""
-CONSOLE MESSAGE: line 1: Warning: Problem parsing viewBox=""
-CONSOLE MESSAGE: line 1: Warning: Problem parsing viewBox=""
-../resources/tests11.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests11.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests11-write-expected.txt b/LayoutTests/html5lib/generated/run-tests11-write-expected.txt
new file mode 100644
index 0000000..ff0b915
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests11-write-expected.txt
@@ -0,0 +1,4 @@
+CONSOLE MESSAGE: Warning: Problem parsing viewBox=""
+CONSOLE MESSAGE: Warning: Problem parsing viewBox=""
+CONSOLE MESSAGE: Warning: Problem parsing viewBox=""
+../resources/tests11.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests11-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests11-write.html
index c15c4c5..c9a3eb8 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests11-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests11.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests11.html b/LayoutTests/html5lib/generated/run-tests11.html
deleted file mode 100644
index 990f69b..0000000
--- a/LayoutTests/html5lib/generated/run-tests11.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests11.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests12-data-expected.txt b/LayoutTests/html5lib/generated/run-tests12-data-expected.txt
new file mode 100644
index 0000000..e353ee8
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests12-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests12.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests12-data.html b/LayoutTests/html5lib/generated/run-tests12-data.html
new file mode 100644
index 0000000..d7b87a2
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests12-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests12.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests12-expected.txt b/LayoutTests/html5lib/generated/run-tests12-expected.txt
deleted file mode 100644
index f5eb8b7..0000000
--- a/LayoutTests/html5lib/generated/run-tests12-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests12.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests12.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests12-write-expected.txt b/LayoutTests/html5lib/generated/run-tests12-write-expected.txt
new file mode 100644
index 0000000..e353ee8
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests12-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests12.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests12-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests12-write.html
index c15c4c5..de240e0 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests12-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests12.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests12.html b/LayoutTests/html5lib/generated/run-tests12.html
deleted file mode 100644
index 5262f91..0000000
--- a/LayoutTests/html5lib/generated/run-tests12.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests12.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests14-data-expected.txt b/LayoutTests/html5lib/generated/run-tests14-data-expected.txt
new file mode 100644
index 0000000..e4f8d04
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests14-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests14.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests14-data.html b/LayoutTests/html5lib/generated/run-tests14-data.html
new file mode 100644
index 0000000..8cd2c54
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests14-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests14.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests14-expected.txt b/LayoutTests/html5lib/generated/run-tests14-expected.txt
deleted file mode 100644
index ac5a131..0000000
--- a/LayoutTests/html5lib/generated/run-tests14-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests14.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests14.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests14-write-expected.txt b/LayoutTests/html5lib/generated/run-tests14-write-expected.txt
new file mode 100644
index 0000000..e4f8d04
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests14-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests14.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests14-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests14-write.html
index c15c4c5..648529b 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests14-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests14.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests14.html b/LayoutTests/html5lib/generated/run-tests14.html
deleted file mode 100644
index 19e1fac..0000000
--- a/LayoutTests/html5lib/generated/run-tests14.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests14.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests15-data-expected.txt b/LayoutTests/html5lib/generated/run-tests15-data-expected.txt
new file mode 100644
index 0000000..d691ace
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests15-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests15.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests15-data.html b/LayoutTests/html5lib/generated/run-tests15-data.html
new file mode 100644
index 0000000..731bd2d
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests15-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests15.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests15-expected.txt b/LayoutTests/html5lib/generated/run-tests15-expected.txt
deleted file mode 100644
index a10ff94..0000000
--- a/LayoutTests/html5lib/generated/run-tests15-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests15.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests15.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests15-write-expected.txt b/LayoutTests/html5lib/generated/run-tests15-write-expected.txt
new file mode 100644
index 0000000..d691ace
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests15-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests15.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests15-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests15-write.html
index c15c4c5..fbb30ce 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests15-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests15.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests15.html b/LayoutTests/html5lib/generated/run-tests15.html
deleted file mode 100644
index 99d0fb9..0000000
--- a/LayoutTests/html5lib/generated/run-tests15.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests15.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests16-data-expected.txt b/LayoutTests/html5lib/generated/run-tests16-data-expected.txt
new file mode 100644
index 0000000..aea591f
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests16-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests16.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests16-data.html b/LayoutTests/html5lib/generated/run-tests16-data.html
new file mode 100644
index 0000000..f75e766
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests16-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests16.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests16-expected.txt b/LayoutTests/html5lib/generated/run-tests16-expected.txt
deleted file mode 100644
index f05f896..0000000
--- a/LayoutTests/html5lib/generated/run-tests16-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests16.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests16.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests16-write-expected.txt b/LayoutTests/html5lib/generated/run-tests16-write-expected.txt
new file mode 100644
index 0000000..aea591f
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests16-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests16.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests16-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests16-write.html
index c15c4c5..0a18a9d 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests16-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests16.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests16.html b/LayoutTests/html5lib/generated/run-tests16.html
deleted file mode 100644
index 4f81ef6..0000000
--- a/LayoutTests/html5lib/generated/run-tests16.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests16.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests17-data-expected.txt b/LayoutTests/html5lib/generated/run-tests17-data-expected.txt
new file mode 100644
index 0000000..beab774
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests17-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests17.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests17-data.html b/LayoutTests/html5lib/generated/run-tests17-data.html
new file mode 100644
index 0000000..9d17536
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests17-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests17.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests17-expected.txt b/LayoutTests/html5lib/generated/run-tests17-expected.txt
deleted file mode 100644
index 5dfa73d..0000000
--- a/LayoutTests/html5lib/generated/run-tests17-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests17.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests17.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests17-write-expected.txt b/LayoutTests/html5lib/generated/run-tests17-write-expected.txt
new file mode 100644
index 0000000..beab774
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests17-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests17.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests17-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests17-write.html
index c15c4c5..beb10c5 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests17-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests17.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests17.html b/LayoutTests/html5lib/generated/run-tests17.html
deleted file mode 100644
index de80b4e..0000000
--- a/LayoutTests/html5lib/generated/run-tests17.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests17.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests18-data-expected.txt b/LayoutTests/html5lib/generated/run-tests18-data-expected.txt
new file mode 100644
index 0000000..b2e68fc
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests18-data-expected.txt
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token <
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token <
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token <
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token <
+../resources/tests18.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18-data.html b/LayoutTests/html5lib/generated/run-tests18-data.html
new file mode 100644
index 0000000..baf918f
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests18-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests18.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests18-expected.txt b/LayoutTests/html5lib/generated/run-tests18-expected.txt
deleted file mode 100644
index 971fd30..0000000
--- a/LayoutTests/html5lib/generated/run-tests18-expected.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token '<'
-CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token '<'
-CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token '<'
-CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token '<'
-CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token '<'
-CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token '<'
-CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token '<'
-CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token '<'
-../resources/tests18.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests18.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18-write-expected.txt b/LayoutTests/html5lib/generated/run-tests18-write-expected.txt
new file mode 100644
index 0000000..b2e68fc
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests18-write-expected.txt
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token <
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token <
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token <
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token <
+../resources/tests18.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests18-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests18-write.html
index c15c4c5..f0ab198 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests18-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests18.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests19-data-expected.txt b/LayoutTests/html5lib/generated/run-tests19-data-expected.txt
new file mode 100644
index 0000000..7c647f0
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests19-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests19.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests19-data.html b/LayoutTests/html5lib/generated/run-tests19-data.html
new file mode 100644
index 0000000..0b62959
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests19-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests19.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests19-expected.txt b/LayoutTests/html5lib/generated/run-tests19-expected.txt
deleted file mode 100644
index fd262a2..0000000
--- a/LayoutTests/html5lib/generated/run-tests19-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests19.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests19.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests19-write-expected.txt b/LayoutTests/html5lib/generated/run-tests19-write-expected.txt
new file mode 100644
index 0000000..7c647f0
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests19-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests19.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests19-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests19-write.html
index c15c4c5..a7a3907 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests19-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests19.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests19.html b/LayoutTests/html5lib/generated/run-tests19.html
deleted file mode 100644
index d8d9e8e..0000000
--- a/LayoutTests/html5lib/generated/run-tests19.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests19.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests2-data-expected.txt b/LayoutTests/html5lib/generated/run-tests2-data-expected.txt
new file mode 100644
index 0000000..278ed2c
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests2-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests2.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2-data.html b/LayoutTests/html5lib/generated/run-tests2-data.html
new file mode 100644
index 0000000..b553614
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests2-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests2.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests2-expected.txt b/LayoutTests/html5lib/generated/run-tests2-expected.txt
deleted file mode 100644
index b5e2662..0000000
--- a/LayoutTests/html5lib/generated/run-tests2-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests2.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests2.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2-write-expected.txt b/LayoutTests/html5lib/generated/run-tests2-write-expected.txt
new file mode 100644
index 0000000..278ed2c
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests2-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests2.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests2-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests2-write.html
index c15c4c5..21d9b608 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests2-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests2.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests20-data-expected.txt b/LayoutTests/html5lib/generated/run-tests20-data-expected.txt
new file mode 100644
index 0000000..f9258a1
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests20-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests20.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests20-data.html b/LayoutTests/html5lib/generated/run-tests20-data.html
new file mode 100644
index 0000000..aca7b9c
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests20-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests20.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests20-expected.txt b/LayoutTests/html5lib/generated/run-tests20-expected.txt
deleted file mode 100644
index ce30deb..0000000
--- a/LayoutTests/html5lib/generated/run-tests20-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests20.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests20.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests20-write-expected.txt b/LayoutTests/html5lib/generated/run-tests20-write-expected.txt
new file mode 100644
index 0000000..f9258a1
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests20-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests20.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests20-write.html
similarity index 65%
rename from LayoutTests/html5lib/generated/run-tests2.html
rename to LayoutTests/html5lib/generated/run-tests20-write.html
index c15c4c5..16cd0fc 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests20-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests20.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests20.html b/LayoutTests/html5lib/generated/run-tests20.html
deleted file mode 100644
index 8f5933c..0000000
--- a/LayoutTests/html5lib/generated/run-tests20.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests20.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests21-data-expected.txt b/LayoutTests/html5lib/generated/run-tests21-data-expected.txt
new file mode 100644
index 0000000..85dfed6
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests21-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests21.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests21-data.html b/LayoutTests/html5lib/generated/run-tests21-data.html
new file mode 100644
index 0000000..e09c0dd
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests21-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests21.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests21-expected.txt b/LayoutTests/html5lib/generated/run-tests21-expected.txt
deleted file mode 100644
index 0898bf9..0000000
--- a/LayoutTests/html5lib/generated/run-tests21-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests21.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests21.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests21-write-expected.txt b/LayoutTests/html5lib/generated/run-tests21-write-expected.txt
new file mode 100644
index 0000000..85dfed6
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests21-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests21.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests21-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests21-write.html
index c15c4c5..719817d 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests21-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests21.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests21.html b/LayoutTests/html5lib/generated/run-tests21.html
deleted file mode 100644
index 9c8ad63..0000000
--- a/LayoutTests/html5lib/generated/run-tests21.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests21.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests22-data-expected.txt b/LayoutTests/html5lib/generated/run-tests22-data-expected.txt
new file mode 100644
index 0000000..9d0e5ad
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests22-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests22.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests22-data.html b/LayoutTests/html5lib/generated/run-tests22-data.html
new file mode 100644
index 0000000..2345358
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests22-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests22.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests22-expected.txt b/LayoutTests/html5lib/generated/run-tests22-expected.txt
deleted file mode 100644
index 68b2ef5f..0000000
--- a/LayoutTests/html5lib/generated/run-tests22-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/test22.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/test22.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests22-write-expected.txt b/LayoutTests/html5lib/generated/run-tests22-write-expected.txt
new file mode 100644
index 0000000..9d0e5ad
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests22-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests22.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests22-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests22-write.html
index c15c4c5..559b1be 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests22-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests22.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests22.html b/LayoutTests/html5lib/generated/run-tests22.html
deleted file mode 100644
index 75fa8df..0000000
--- a/LayoutTests/html5lib/generated/run-tests22.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/test22.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests23-data-expected.txt b/LayoutTests/html5lib/generated/run-tests23-data-expected.txt
new file mode 100644
index 0000000..e25ea2f
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests23-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests23.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests23-data.html b/LayoutTests/html5lib/generated/run-tests23-data.html
new file mode 100644
index 0000000..0df401e0
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests23-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests23.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests23-expected.txt b/LayoutTests/html5lib/generated/run-tests23-expected.txt
deleted file mode 100644
index 123c428..0000000
--- a/LayoutTests/html5lib/generated/run-tests23-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests23.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests23.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests23-write-expected.txt b/LayoutTests/html5lib/generated/run-tests23-write-expected.txt
new file mode 100644
index 0000000..e25ea2f
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests23-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests23.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests23-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests23-write.html
index c15c4c5..81141f7 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests23-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests23.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests23.html b/LayoutTests/html5lib/generated/run-tests23.html
deleted file mode 100644
index 0f9502f..0000000
--- a/LayoutTests/html5lib/generated/run-tests23.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests23.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests24-data-expected.txt b/LayoutTests/html5lib/generated/run-tests24-data-expected.txt
new file mode 100644
index 0000000..37a0fbe
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests24-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests24.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests24-data.html b/LayoutTests/html5lib/generated/run-tests24-data.html
new file mode 100644
index 0000000..7c31b5d
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests24-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests24.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests24-expected.txt b/LayoutTests/html5lib/generated/run-tests24-expected.txt
deleted file mode 100644
index 27e5821..0000000
--- a/LayoutTests/html5lib/generated/run-tests24-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests24.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests24.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests24-write-expected.txt b/LayoutTests/html5lib/generated/run-tests24-write-expected.txt
new file mode 100644
index 0000000..37a0fbe
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests24-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests24.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests24-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests24-write.html
index c15c4c5..f2ff791 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests24-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests24.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests24.html b/LayoutTests/html5lib/generated/run-tests24.html
deleted file mode 100644
index 549931b..0000000
--- a/LayoutTests/html5lib/generated/run-tests24.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests24.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests25-data-expected.txt b/LayoutTests/html5lib/generated/run-tests25-data-expected.txt
new file mode 100644
index 0000000..e08f1f6
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests25-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests25.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests25-data.html b/LayoutTests/html5lib/generated/run-tests25-data.html
new file mode 100644
index 0000000..df49147
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests25-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests25.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests25-expected.txt b/LayoutTests/html5lib/generated/run-tests25-expected.txt
deleted file mode 100644
index 9b83e73..0000000
--- a/LayoutTests/html5lib/generated/run-tests25-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests25.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests25.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests25-write-expected.txt b/LayoutTests/html5lib/generated/run-tests25-write-expected.txt
new file mode 100644
index 0000000..e08f1f6
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests25-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests25.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests25-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests25-write.html
index c15c4c5..f083552 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests25-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests25.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests25.html b/LayoutTests/html5lib/generated/run-tests25.html
deleted file mode 100644
index f076f2b..0000000
--- a/LayoutTests/html5lib/generated/run-tests25.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests25.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests26-data-expected.txt b/LayoutTests/html5lib/generated/run-tests26-data-expected.txt
new file mode 100644
index 0000000..7c0c91b
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests26-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests26.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests26-data.html b/LayoutTests/html5lib/generated/run-tests26-data.html
new file mode 100644
index 0000000..2a59dcc
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests26-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests26.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests26-expected.txt b/LayoutTests/html5lib/generated/run-tests26-expected.txt
deleted file mode 100644
index 6c53299..0000000
--- a/LayoutTests/html5lib/generated/run-tests26-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests26.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests26.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests26-write-expected.txt b/LayoutTests/html5lib/generated/run-tests26-write-expected.txt
new file mode 100644
index 0000000..7c0c91b
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests26-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests26.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests26-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests26-write.html
index c15c4c5..721d99e 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests26-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests26.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests26.html b/LayoutTests/html5lib/generated/run-tests26.html
deleted file mode 100644
index 6ec5aba..0000000
--- a/LayoutTests/html5lib/generated/run-tests26.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests26.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests3-data-expected.txt b/LayoutTests/html5lib/generated/run-tests3-data-expected.txt
new file mode 100644
index 0000000..0f1888b
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests3-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests3.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests3-data.html b/LayoutTests/html5lib/generated/run-tests3-data.html
new file mode 100644
index 0000000..4102dce
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests3-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests3.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests3-expected.txt b/LayoutTests/html5lib/generated/run-tests3-expected.txt
deleted file mode 100644
index 2a58e8c..0000000
--- a/LayoutTests/html5lib/generated/run-tests3-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests3.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests3.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests3-write-expected.txt b/LayoutTests/html5lib/generated/run-tests3-write-expected.txt
new file mode 100644
index 0000000..0f1888b
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests3-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests3.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests3-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests3-write.html
index c15c4c5..63e9aad 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests3-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests3.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests3.html b/LayoutTests/html5lib/generated/run-tests3.html
deleted file mode 100644
index 593ee63..0000000
--- a/LayoutTests/html5lib/generated/run-tests3.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests3.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests4-data-expected.txt b/LayoutTests/html5lib/generated/run-tests4-data-expected.txt
new file mode 100644
index 0000000..0000470
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests4-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests4.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests4-data.html b/LayoutTests/html5lib/generated/run-tests4-data.html
new file mode 100644
index 0000000..454d165
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests4-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests4.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests4-expected.txt b/LayoutTests/html5lib/generated/run-tests4-expected.txt
deleted file mode 100644
index 85bf729..0000000
--- a/LayoutTests/html5lib/generated/run-tests4-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests4.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests4.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests4-write-expected.txt b/LayoutTests/html5lib/generated/run-tests4-write-expected.txt
new file mode 100644
index 0000000..0000470
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests4-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests4.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests4-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests4-write.html
index c15c4c5..bba33b5 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests4-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests4.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests4.html b/LayoutTests/html5lib/generated/run-tests4.html
deleted file mode 100644
index 75bbc29..0000000
--- a/LayoutTests/html5lib/generated/run-tests4.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests4.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests5-data-expected.txt b/LayoutTests/html5lib/generated/run-tests5-data-expected.txt
new file mode 100644
index 0000000..32188d2
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests5-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests5.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests5-data.html b/LayoutTests/html5lib/generated/run-tests5-data.html
new file mode 100644
index 0000000..e54306c
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests5-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests5.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests5-expected.txt b/LayoutTests/html5lib/generated/run-tests5-expected.txt
deleted file mode 100644
index a8a31ec..0000000
--- a/LayoutTests/html5lib/generated/run-tests5-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests5.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests5.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests5-write-expected.txt b/LayoutTests/html5lib/generated/run-tests5-write-expected.txt
new file mode 100644
index 0000000..32188d2
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests5-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests5.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests5-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests5-write.html
index c15c4c5..2b8250a 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests5-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests5.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests5.html b/LayoutTests/html5lib/generated/run-tests5.html
deleted file mode 100644
index f72ddb4..0000000
--- a/LayoutTests/html5lib/generated/run-tests5.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests5.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests6-data-expected.txt b/LayoutTests/html5lib/generated/run-tests6-data-expected.txt
new file mode 100644
index 0000000..9eb39c0
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests6-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests6.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests6-data.html b/LayoutTests/html5lib/generated/run-tests6-data.html
new file mode 100644
index 0000000..e759fc1
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests6-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests6.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests6-expected.txt b/LayoutTests/html5lib/generated/run-tests6-expected.txt
deleted file mode 100644
index a141ab4..0000000
--- a/LayoutTests/html5lib/generated/run-tests6-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests6.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests6.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests6-write-expected.txt b/LayoutTests/html5lib/generated/run-tests6-write-expected.txt
new file mode 100644
index 0000000..9eb39c0
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests6-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests6.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests6-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests6-write.html
index c15c4c5..9d02563 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests6-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests6.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests6.html b/LayoutTests/html5lib/generated/run-tests6.html
deleted file mode 100644
index 528158f..0000000
--- a/LayoutTests/html5lib/generated/run-tests6.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests6.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests7-data-expected.txt b/LayoutTests/html5lib/generated/run-tests7-data-expected.txt
new file mode 100644
index 0000000..ad7b345
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests7-data-expected.txt
@@ -0,0 +1,2 @@
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token <
+../resources/tests7.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests7-data.html b/LayoutTests/html5lib/generated/run-tests7-data.html
new file mode 100644
index 0000000..30536c8
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests7-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests7.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests7-expected.txt b/LayoutTests/html5lib/generated/run-tests7-expected.txt
deleted file mode 100644
index dd167cf..0000000
--- a/LayoutTests/html5lib/generated/run-tests7-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token '<'
-CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token '<'
-../resources/tests7.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests7.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests7-write-expected.txt b/LayoutTests/html5lib/generated/run-tests7-write-expected.txt
new file mode 100644
index 0000000..ad7b345
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests7-write-expected.txt
@@ -0,0 +1,2 @@
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token <
+../resources/tests7.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests7-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests7-write.html
index c15c4c5..c0329a9 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests7-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests7.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests7.html b/LayoutTests/html5lib/generated/run-tests7.html
deleted file mode 100644
index 889bd26..0000000
--- a/LayoutTests/html5lib/generated/run-tests7.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests7.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests8-data-expected.txt b/LayoutTests/html5lib/generated/run-tests8-data-expected.txt
new file mode 100644
index 0000000..f157812
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests8-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests8.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests8-data.html b/LayoutTests/html5lib/generated/run-tests8-data.html
new file mode 100644
index 0000000..f96fefc
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests8-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests8.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests8-expected.txt b/LayoutTests/html5lib/generated/run-tests8-expected.txt
deleted file mode 100644
index e65c63d..0000000
--- a/LayoutTests/html5lib/generated/run-tests8-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests8.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests8.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests8-write-expected.txt b/LayoutTests/html5lib/generated/run-tests8-write-expected.txt
new file mode 100644
index 0000000..f157812
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests8-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests8.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests8-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests8-write.html
index c15c4c5..08c10c4 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests8-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests8.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests8.html b/LayoutTests/html5lib/generated/run-tests8.html
deleted file mode 100644
index 1dc0493..0000000
--- a/LayoutTests/html5lib/generated/run-tests8.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests8.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests9-data-expected.txt b/LayoutTests/html5lib/generated/run-tests9-data-expected.txt
new file mode 100644
index 0000000..4ff132e
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests9-data-expected.txt
@@ -0,0 +1 @@
+../resources/tests9.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests9-data.html b/LayoutTests/html5lib/generated/run-tests9-data.html
new file mode 100644
index 0000000..b410aa4
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests9-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests9.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests9-expected.txt b/LayoutTests/html5lib/generated/run-tests9-expected.txt
deleted file mode 100644
index b0d1ec6..0000000
--- a/LayoutTests/html5lib/generated/run-tests9-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-../resources/tests9.dat: PASS
-
-Switching to data: url parser (threaded if available) and re-running...
-
-../resources/tests9.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests9-write-expected.txt b/LayoutTests/html5lib/generated/run-tests9-write-expected.txt
new file mode 100644
index 0000000..4ff132e
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests9-write-expected.txt
@@ -0,0 +1 @@
+../resources/tests9.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tests9-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tests9-write.html
index c15c4c5..9586eec 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tests9-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tests9.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests9.html b/LayoutTests/html5lib/generated/run-tests9.html
deleted file mode 100644
index 6b824f2..0000000
--- a/LayoutTests/html5lib/generated/run-tests9.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!doctype html>
-<script>
-var test_files = [
- '../resources/tests9.dat',
-]
-</script>
-<script src="../../resources/dump-as-markup.js"></script>
-<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests_innerHTML_1-data-expected.txt b/LayoutTests/html5lib/generated/run-tests_innerHTML_1-data-expected.txt
new file mode 100644
index 0000000..a30c774
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests_innerHTML_1-data-expected.txt
@@ -0,0 +1,8 @@
+ALERT: Invalid test: #errors
+#document-fragment
+html
+#document
+| <head>
+| <body>
+
+../resources/tests_innerHTML_1.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests_innerHTML_1-data.html b/LayoutTests/html5lib/generated/run-tests_innerHTML_1-data.html
new file mode 100644
index 0000000..73d5f43
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests_innerHTML_1-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tests_innerHTML_1.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tests_innerHTML_1-write-expected.txt b/LayoutTests/html5lib/generated/run-tests_innerHTML_1-write-expected.txt
new file mode 100644
index 0000000..a30c774
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tests_innerHTML_1-write-expected.txt
@@ -0,0 +1,8 @@
+ALERT: Invalid test: #errors
+#document-fragment
+html
+#document
+| <head>
+| <body>
+
+../resources/tests_innerHTML_1.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests18.html b/LayoutTests/html5lib/generated/run-tests_innerHTML_1-write.html
similarity index 62%
copy from LayoutTests/html5lib/generated/run-tests18.html
copy to LayoutTests/html5lib/generated/run-tests_innerHTML_1-write.html
index f1274ca..d740be6 100644
--- a/LayoutTests/html5lib/generated/run-tests18.html
+++ b/LayoutTests/html5lib/generated/run-tests_innerHTML_1-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests18.dat',
-]
+var test_files = [ '../resources/tests_innerHTML_1.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tricky01-data-expected.txt b/LayoutTests/html5lib/generated/run-tricky01-data-expected.txt
new file mode 100644
index 0000000..6d75067
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tricky01-data-expected.txt
@@ -0,0 +1 @@
+../resources/tricky01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tricky01-data.html b/LayoutTests/html5lib/generated/run-tricky01-data.html
new file mode 100644
index 0000000..55f793f
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tricky01-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/tricky01.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-tricky01-write-expected.txt b/LayoutTests/html5lib/generated/run-tricky01-write-expected.txt
new file mode 100644
index 0000000..6d75067
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-tricky01-write-expected.txt
@@ -0,0 +1 @@
+../resources/tricky01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-tricky01-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-tricky01-write.html
index c15c4c5..ec13185 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-tricky01-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/tricky01.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-webkit01-data-expected.txt b/LayoutTests/html5lib/generated/run-webkit01-data-expected.txt
new file mode 100644
index 0000000..9f5f4f3
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-webkit01-data-expected.txt
@@ -0,0 +1,3 @@
+CONSOLE MESSAGE: line 3: PASS
+CONSOLE MESSAGE: line 3: FOO<span>BAR</span>BAZ
+../resources/webkit01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-webkit01-data.html b/LayoutTests/html5lib/generated/run-webkit01-data.html
new file mode 100644
index 0000000..5246b3b
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-webkit01-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/webkit01.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-webkit01-write-expected.txt b/LayoutTests/html5lib/generated/run-webkit01-write-expected.txt
new file mode 100644
index 0000000..7e1ba5b
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-webkit01-write-expected.txt
@@ -0,0 +1,3 @@
+CONSOLE MESSAGE: line 2: PASS
+CONSOLE MESSAGE: line 2: FOO<span>BAR</span>BAZ
+../resources/webkit01.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-webkit01-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-webkit01-write.html
index c15c4c5..97cc9b2 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-webkit01-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/webkit01.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-webkit02-data-expected.txt b/LayoutTests/html5lib/generated/run-webkit02-data-expected.txt
new file mode 100644
index 0000000..524feb0
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-webkit02-data-expected.txt
@@ -0,0 +1 @@
+../resources/webkit02.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-webkit02-data.html b/LayoutTests/html5lib/generated/run-webkit02-data.html
new file mode 100644
index 0000000..dc3ea64
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-webkit02-data.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<script>
+var test_files = [ '../resources/webkit02.dat' ]
+</script>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>window.forceDataURLs = true;</script>
+<script src="../resources/runner.js"></script>
diff --git a/LayoutTests/html5lib/generated/run-webkit02-write-expected.txt b/LayoutTests/html5lib/generated/run-webkit02-write-expected.txt
new file mode 100644
index 0000000..524feb0
--- /dev/null
+++ b/LayoutTests/html5lib/generated/run-webkit02-write-expected.txt
@@ -0,0 +1 @@
+../resources/webkit02.dat: PASS
diff --git a/LayoutTests/html5lib/generated/run-tests2.html b/LayoutTests/html5lib/generated/run-webkit02-write.html
similarity index 65%
copy from LayoutTests/html5lib/generated/run-tests2.html
copy to LayoutTests/html5lib/generated/run-webkit02-write.html
index c15c4c5..fc84356 100644
--- a/LayoutTests/html5lib/generated/run-tests2.html
+++ b/LayoutTests/html5lib/generated/run-webkit02-write.html
@@ -1,8 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
<script>
-var test_files = [
- '../resources/tests2.dat',
-]
+var test_files = [ '../resources/webkit02.dat' ]
</script>
<script src="../../resources/dump-as-markup.js"></script>
+
<script src="../resources/runner.js"></script>
