Add --layout-2020 to ./mach test-wpt and ./mach update-wpt

… with separate metadata (expected results) and include manifest.
servo · Jul 4, 2019 · 5cabcd5 · 5cabcd5
1 parent 2b01c26
commit 5cabcd5
Show file tree

Hide file tree

Showing 95 changed files with 200 additions and 0 deletions.
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
@@ -72,6 +72,8 @@ def create_parser_wpt():
                         help="Run under chaos mode in rr until a failure is captured")
     parser.add_argument('--pref', default=[], action="append", dest="prefs",
                         help="Pass preferences to servo")
+    parser.add_argument('--layout-2020', default=False, action="store_true",
+                        help="Use expected results for the 2020 layout engine")
     parser.add_argument('--always-succeed', default=False, action="store_true",
                         help="Always yield exit code of zero")
     return parser

diff --git a/tests/wpt/include-layout-2020.ini b/tests/wpt/include-layout-2020.ini
@@ -0,0 +1,8 @@
+skip: true
+[css]
+  skip: true
+  [CSS2]
+    skip: true
+    [box-display]
+      skip: false
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-box-generation-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-box-generation-001.xht.ini
@@ -0,0 +1,2 @@
+[anonymous-box-generation-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini
@@ -0,0 +1,2 @@
+[anonymous-boxes-inheritance-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-inline-whitespace-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-inline-whitespace-001.xht.ini
@@ -0,0 +1,2 @@
+[anonymous-inline-whitespace-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-001.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-002.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-003.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-007.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-007.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-008.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-008.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-relpos-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini
@@ -0,0 +1,2 @@
+[block-in-inline-relpos-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-001.xht.ini
@@ -0,0 +1,2 @@
+[box-generation-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-002.xht.ini
@@ -0,0 +1,2 @@
+[box-generation-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-001.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-002.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-003.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-004.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-004.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-004.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-005.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-005.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-006.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-006.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-006.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-007.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-007.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-008.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-009.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-009.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-010.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-019.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-019.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-019.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-020.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-020.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-020.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-021.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-021.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-021.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-022.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-022.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-022.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-023.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-023.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-023.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-026.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-026.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-026.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-027.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-027.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-027.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-028.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-028.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-028.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-029.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-029.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-029.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-030.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-030.xht.ini
@@ -0,0 +1,2 @@
+[containing-block-030.xht]
+  expected: CRASH
diff --git a/...t/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-beginning-001.xht.ini b/...t/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-beginning-001.xht.ini
@@ -0,0 +1,2 @@
+[delete-block-in-inlines-beginning-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-end-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-end-001.xht.ini
@@ -0,0 +1,2 @@
+[delete-block-in-inlines-end-001.xht]
+  expected: CRASH
diff --git a/.../wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-middle-001.xht.ini b/.../wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[delete-block-in-inlines-middle-001.xht]
+  expected: CRASH
diff --git a/...t/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-beginning-001.xht.ini b/...t/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-beginning-001.xht.ini
@@ -0,0 +1,2 @@
+[delete-inline-in-blocks-beginning-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-end-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-end-001.xht.ini
@@ -0,0 +1,2 @@
+[delete-inline-in-blocks-end-001.xht]
+  expected: CRASH
diff --git a/.../wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-001.xht.ini b/.../wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[delete-inline-in-blocks-middle-001.xht]
+  expected: CRASH
diff --git a/.../wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-002.xht.ini b/.../wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-002.xht.ini
@@ -0,0 +1,2 @@
+[delete-inline-in-blocks-middle-002.xht]
+  expected: CRASH
diff --git a/.../wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-003.xht.ini b/.../wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-003.xht.ini
@@ -0,0 +1,2 @@
+[delete-inline-in-blocks-middle-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/descendant-display-none-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/descendant-display-none-001.xht.ini
@@ -0,0 +1,2 @@
+[descendant-display-none-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/descendant-display-override-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/descendant-display-override-001.xht.ini
@@ -0,0 +1,2 @@
+[descendant-display-override-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-001.xht.ini
@@ -0,0 +1,2 @@
+[display-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-002.xht.ini
@@ -0,0 +1,2 @@
+[display-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-005.xht.ini
@@ -0,0 +1,2 @@
+[display-005.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-006.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-006.xht.ini
@@ -0,0 +1,2 @@
+[display-006.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-007.xht.ini
@@ -0,0 +1,2 @@
+[display-007.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-008.xht.ini
@@ -0,0 +1,2 @@
+[display-008.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-009.xht.ini
@@ -0,0 +1,2 @@
+[display-009.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-010.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-010.xht.ini
@@ -0,0 +1,2 @@
+[display-010.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-011.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-011.xht.ini
@@ -0,0 +1,2 @@
+[display-011.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-012.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-012.xht.ini
@@ -0,0 +1,2 @@
+[display-012.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-013.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-013.xht.ini
@@ -0,0 +1,2 @@
+[display-013.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-014.xht.ini
@@ -0,0 +1,2 @@
+[display-014.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-015.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-015.xht.ini
@@ -0,0 +1,2 @@
+[display-015.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-016.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-016.xht.ini
@@ -0,0 +1,2 @@
+[display-016.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-017.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-017.xht.ini
@@ -0,0 +1,2 @@
+[display-017.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-018.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-018.xht.ini
@@ -0,0 +1,2 @@
+[display-018.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini
@@ -0,0 +1,2 @@
+[display-change-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-001.xht.ini
@@ -0,0 +1,2 @@
+[display-none-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-002.xht.ini
@@ -0,0 +1,2 @@
+[display-none-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-003.xht.ini
@@ -0,0 +1,2 @@
+[display-none-003.xht]
+  expected: CRASH
diff --git a/...adata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001.xht.ini b/...adata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-begin-001.xht]
+  expected: CRASH
diff --git a/...adata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002.xht.ini b/...adata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-begin-002.xht]
+  expected: CRASH
diff --git a/...adata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003.xht.ini b/...adata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-begin-003.xht]
+  expected: CRASH
diff --git a/...etadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001.xht.ini b/...etadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-end-001.xht]
+  expected: CRASH
diff --git a/...etadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002.xht.ini b/...etadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-end-002.xht]
+  expected: CRASH
diff --git a/...etadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003.xht.ini b/...etadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-end-003.xht]
+  expected: CRASH
diff --git a/...data-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001.xht.ini b/...data-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-middle-001.xht]
+  expected: CRASH
diff --git a/...data-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002.xht.ini b/...data-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-middle-002.xht]
+  expected: CRASH
diff --git a/...data-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003.xht.ini b/...data-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-blocks-n-inlines-middle-003.xht]
+  expected: CRASH
diff --git a/...t/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-beginning-001.xht.ini b/...t/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-beginning-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-inlines-beginning-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-end-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-end-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-inlines-end-001.xht]
+  expected: CRASH
diff --git a/.../wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-middle-001.xht.ini b/.../wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-block-in-inlines-middle-001.xht]
+  expected: CRASH
diff --git a/...t/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-beginning-001.xht.ini b/...t/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-beginning-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-beginning-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-end-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-end-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-end-001.xht]
+  expected: CRASH
diff --git a/.../wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-middle-001.xht.ini b/.../wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-middle-001.xht]
+  expected: CRASH
diff --git a/.../wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-middle-002.xht.ini b/.../wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-middle-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-middle-002.xht]
+  expected: CRASH
diff --git a/...data-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht.ini b/...data-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-begin-001.xht]
+  expected: CRASH
diff --git a/...data-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002.xht.ini b/...data-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-begin-002.xht]
+  expected: CRASH
diff --git a/...data-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003.xht.ini b/...data-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-begin-003.xht]
+  expected: CRASH
diff --git a/...tadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht.ini b/...tadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-end-001.xht]
+  expected: CRASH
diff --git a/...tadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002.xht.ini b/...tadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-end-002.xht]
+  expected: CRASH
diff --git a/...tadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003.xht.ini b/...tadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-end-003.xht]
+  expected: CRASH
diff --git a/...ata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht.ini b/...ata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-middle-001.xht]
+  expected: CRASH
diff --git a/...ata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002.xht.ini b/...ata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-middle-002.xht]
+  expected: CRASH
diff --git a/...ata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003.xht.ini b/...ata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003.xht.ini
@@ -0,0 +1,2 @@
+[insert-inline-in-blocks-n-inlines-middle-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-002.xht.ini
@@ -0,0 +1,2 @@
+[root-box-002.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-003.xht.ini
@@ -0,0 +1,2 @@
+[root-box-003.xht]
+  expected: CRASH
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-canvas-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-canvas-001.xht.ini
@@ -0,0 +1,2 @@
+[root-canvas-001.xht]
+  expected: CRASH
diff --git a/tests/wpt/run.py b/tests/wpt/run.py
@@ -93,6 +93,10 @@ def set_defaults(kwargs):
 
     wptcommandline.check_args(kwargs)
 
+    if kwargs.pop("layout_2020"):
+        kwargs["test_paths"]["/"]["metadata_path"] = wpt_path("metadata-layout-2020")
+        kwargs["include_manifest"] = wpt_path("include-layout-2020.ini")
+
 
 def main():
     parser = wptcommandline.create_parser()

diff --git a/tests/wpt/update.py b/tests/wpt/update.py
@@ -34,6 +34,10 @@ def set_defaults(kwargs):
     kwargs["store_state"] = False
     updatecommandline.check_args(kwargs)
 
+    if kwargs.pop("layout_2020"):
+        kwargs["test_paths"]["/"]["metadata_path"] = wpt_path("metadata-layout-2020")
+        kwargs["include_manifest"] = wpt_path("include-layout-2020.ini")
+
 
 def main():
     parser = wptcommandline.create_parser()

diff --git a/tests/wpt/update/updatecommandline.py b/tests/wpt/update/updatecommandline.py
@@ -13,6 +13,8 @@ def create_parser():
     parser.add_argument("--token-file", action="store", type=wptcommandline.abs_path,
                         help="Path to file containing github token")
     parser.add_argument("--token", action="store", help="GitHub token to use")
+    parser.add_argument('--layout-2020', default=False, action="store_true",
+                        help="Use expected results for the 2020 layout engine")
     return parser