Skip to content
Permalink
Browse files

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

… with separate metadata (expected results) and include manifest.
  • Loading branch information...
SimonSapin committed Jun 28, 2019
1 parent 2b01c26 commit 5cabcd5268a802b807a9f876c472b83467d3c093
Showing with 200 additions and 0 deletions.
  1. +2 −0 python/servo/testing_commands.py
  2. +8 −0 tests/wpt/include-layout-2020.ini
  3. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-box-generation-001.xht.ini
  4. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini
  5. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/anonymous-inline-whitespace-001.xht.ini
  6. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-001.xht.ini
  7. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-002.xht.ini
  8. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-003.xht.ini
  9. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-007.xht.ini
  10. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-008.xht.ini
  11. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
  12. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/block-in-inline-relpos-002.xht.ini
  13. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-001.xht.ini
  14. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/box-generation-002.xht.ini
  15. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-001.xht.ini
  16. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-002.xht.ini
  17. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-003.xht.ini
  18. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-004.xht.ini
  19. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-005.xht.ini
  20. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-006.xht.ini
  21. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-007.xht.ini
  22. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-008.xht.ini
  23. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-009.xht.ini
  24. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-010.xht.ini
  25. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-019.xht.ini
  26. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-020.xht.ini
  27. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-021.xht.ini
  28. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-022.xht.ini
  29. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-023.xht.ini
  30. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-026.xht.ini
  31. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-027.xht.ini
  32. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-028.xht.ini
  33. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-029.xht.ini
  34. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/containing-block-030.xht.ini
  35. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-beginning-001.xht.ini
  36. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-end-001.xht.ini
  37. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-block-in-inlines-middle-001.xht.ini
  38. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-beginning-001.xht.ini
  39. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-end-001.xht.ini
  40. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-001.xht.ini
  41. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-002.xht.ini
  42. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/delete-inline-in-blocks-middle-003.xht.ini
  43. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/descendant-display-none-001.xht.ini
  44. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/descendant-display-override-001.xht.ini
  45. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-001.xht.ini
  46. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-002.xht.ini
  47. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-005.xht.ini
  48. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-006.xht.ini
  49. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-007.xht.ini
  50. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-008.xht.ini
  51. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-009.xht.ini
  52. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-010.xht.ini
  53. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-011.xht.ini
  54. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-012.xht.ini
  55. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-013.xht.ini
  56. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-014.xht.ini
  57. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-015.xht.ini
  58. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-016.xht.ini
  59. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-017.xht.ini
  60. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-018.xht.ini
  61. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-change-001.xht.ini
  62. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-001.xht.ini
  63. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-002.xht.ini
  64. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/display-none-003.xht.ini
  65. +2 −0 .../wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-001.xht.ini
  66. +2 −0 .../wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-002.xht.ini
  67. +2 −0 .../wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-begin-003.xht.ini
  68. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-001.xht.ini
  69. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-002.xht.ini
  70. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-end-003.xht.ini
  71. +2 −0 ...wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-001.xht.ini
  72. +2 −0 ...wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-002.xht.ini
  73. +2 −0 ...wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-blocks-n-inlines-middle-003.xht.ini
  74. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-beginning-001.xht.ini
  75. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-end-001.xht.ini
  76. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-block-in-inlines-middle-001.xht.ini
  77. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-beginning-001.xht.ini
  78. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-end-001.xht.ini
  79. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-middle-001.xht.ini
  80. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-middle-002.xht.ini
  81. +2 −0 ...wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-001.xht.ini
  82. +2 −0 ...wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-002.xht.ini
  83. +2 −0 ...wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-begin-003.xht.ini
  84. +2 −0 ...s/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-001.xht.ini
  85. +2 −0 ...s/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-002.xht.ini
  86. +2 −0 ...s/wpt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-end-003.xht.ini
  87. +2 −0 ...pt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-001.xht.ini
  88. +2 −0 ...pt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-002.xht.ini
  89. +2 −0 ...pt/metadata-layout-2020/css/CSS2/box-display/insert-inline-in-blocks-n-inlines-middle-003.xht.ini
  90. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-002.xht.ini
  91. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-box-003.xht.ini
  92. +2 −0 tests/wpt/metadata-layout-2020/css/CSS2/box-display/root-canvas-001.xht.ini
  93. +4 −0 tests/wpt/run.py
  94. +4 −0 tests/wpt/update.py
  95. +2 −0 tests/wpt/update/updatecommandline.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
@@ -0,0 +1,8 @@
skip: true
[css]
skip: true
[CSS2]
skip: true
[box-display]
skip: false

@@ -0,0 +1,2 @@
[anonymous-box-generation-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[anonymous-boxes-inheritance-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[anonymous-inline-whitespace-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[block-in-inline-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[block-in-inline-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[block-in-inline-003.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[block-in-inline-007.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[block-in-inline-008.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[block-in-inline-relpos-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[block-in-inline-relpos-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[box-generation-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[box-generation-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-003.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-004.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-005.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-006.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-007.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-008.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-009.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-010.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-019.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-020.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-021.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-022.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-023.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-026.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-027.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-028.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-029.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[containing-block-030.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[delete-block-in-inlines-beginning-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[delete-block-in-inlines-end-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[delete-block-in-inlines-middle-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[delete-inline-in-blocks-beginning-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[delete-inline-in-blocks-end-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[delete-inline-in-blocks-middle-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[delete-inline-in-blocks-middle-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[delete-inline-in-blocks-middle-003.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[descendant-display-none-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[descendant-display-override-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-005.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-006.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-007.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-008.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-009.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-010.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-011.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-012.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-013.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-014.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-015.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-016.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-017.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-018.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-change-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-none-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-none-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[display-none-003.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-block-in-blocks-n-inlines-begin-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-block-in-blocks-n-inlines-begin-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-block-in-blocks-n-inlines-begin-003.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-block-in-blocks-n-inlines-end-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-block-in-blocks-n-inlines-end-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-block-in-blocks-n-inlines-end-003.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-block-in-blocks-n-inlines-middle-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-block-in-blocks-n-inlines-middle-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-block-in-blocks-n-inlines-middle-003.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-block-in-inlines-beginning-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-block-in-inlines-end-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-block-in-inlines-middle-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-beginning-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-end-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-middle-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-middle-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-n-inlines-begin-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-n-inlines-begin-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-n-inlines-begin-003.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-n-inlines-end-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-n-inlines-end-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-n-inlines-end-003.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-n-inlines-middle-001.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-n-inlines-middle-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[insert-inline-in-blocks-n-inlines-middle-003.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[root-box-002.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[root-box-003.xht]
expected: CRASH
@@ -0,0 +1,2 @@
[root-canvas-001.xht]
expected: CRASH
@@ -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()
@@ -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()
@@ -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


0 comments on commit 5cabcd5

Please sign in to comment.
You can’t perform that action at this time.