Rename metadata directories

This renames:
 - `tests/wpt/metadata` → `tests/wpt/meta-legacy-layout`
 - `tests/wpt/metadata-layout-2020` → `tests/wpt/meta`
 - `tests/wpt/mozilla/meta` → `tests/wpt/mozilla/meta-legacy-layout`
 - `tests/wpt/mozilla/meta-layout-2020` → `tests/wpt/mozilla/meta`

tests/wpt/README.md

@@ -10,7 +10,7 @@ In particular, this folder contains:
 * `config.ini`: some configuration for the web-platform-tests.
 * `include.ini`: the subset of web-platform-tests we currently run.
 * `web-platform-tests`: copy of the web-platform-tests.
-* `metadata`: expected failures for the web-platform-tests we run.
+* `meta`: expected failures for the web-platform-tests we run.
 * `mozilla`: web-platform-tests that cannot be upstreamed.
 
 Running the tests
@@ -156,7 +156,7 @@ Updating test expectations
 
 When fixing a bug that causes the result of a test to change, the expected
 results for that test need to be changed. This can be done manually, by editing
-the `.ini` file under the `metadata` folder that corresponds to the test. In
+the `.ini` file under the `meta` folder that corresponds to the test. In
 this case, remove the references to tests whose expectation is now `PASS`, and
 remove `.ini` files that no longer contain any expectations.
 

tests/wpt/config.ini

@@ -13,7 +13,7 @@ run-info = .
 
 [manifest:upstream]
 tests = web-platform-tests
-metadata = metadata
+metadata = meta
 url-base = /
 
 [manifest:mozilla]

tests/wpt/include-layout-2020.ini

@@ -1,44 +0,0 @@
-skip: true
-[_mozilla]
-  skip: true
-  [css]
-    skip: false
-  [mozilla]
-    skip: false
-[css]
-  skip: true
-  [CSS2]
-    skip: false
-  [css-animations]
-    skip: false
-  [css-masking]
-    [clip]
-      skip: false
-  [css-backgrounds]
-    skip: false
-  [css-content]
-    skip: false
-  [css-color]
-    skip: false
-  [css-flexbox]
-    skip: false
-  [css-logical]
-    skip: false
-  [css-position]
-    skip: false
-  [css-text-decor]
-    skip: false
-  [css-transforms]
-    skip: false
-  [css-transitions]
-    skip: false
-  [css-ui]
-    skip: false
-  [css-variables]
-    skip: false
-  [cssom]
-    skip: false
-  [cssom-view]
-    skip: false
-  [filter-effects]
-    skip: false

tests/wpt/include-legacy-layout.ini

@@ -0,0 +1,209 @@
+skip: true
+[_mozilla]
+  skip: false
+  [mozilla]
+    skip: false
+[_webgl]
+  skip: false
+[cookies]
+  skip: false
+  [samesite]
+    skip: true
+[cors]
+  skip: false
+[css]
+  skip: true
+  [compositing]
+    skip: false
+  [CSS2]
+    skip: false
+    [linebox]
+      skip:false
+  [css-align]
+    skip: false
+  [css-animations]
+    skip: false
+  [css-backgrounds]
+    skip: false
+  [css-borders]
+    skip: false
+  [css-color]
+    skip: false
+  [css-conditional]
+    skip: false
+  [css-flexbox]
+    skip: false
+  [css-fonts]
+    skip: false
+  [css-images]
+    skip: false
+  [css-outline]
+    skip: false
+  [css-paint-api]
+    skip: false
+  [css-position]
+    skip: false
+  [css-style-attr]
+    skip: false
+  [css-text]
+    skip: false
+    [i18n]
+      skip: true
+  [css-text-decor]
+    skip: false
+  [css-transforms]
+    skip: false
+  [css-transitions]
+    skip: false
+  [css-ui]
+    skip: false
+  [css-values]
+    skip: false
+  [css-variables]
+    skip: false
+  [cssom]
+    skip: false
+  [cssom-view]
+    skip: false
+  [filter-effects]
+    skip: false
+  [geometry]
+    skip: false
+  [mediaqueries]
+    skip: false
+  [selectors]
+    skip: false
+[custom-elements]
+  skip: false
+[dom]
+  skip: false
+[domparsing]
+  skip: false
+[encoding]
+  skip: false
+[eventsource]
+  skip: false
+[fetch]
+  skip: false
+[FileAPI]
+  skip: false
+[fullscreen]
+  skip: false
+[gamepad]
+  skip: false
+[hr-time]
+  skip: false
+[html]
+  skip: false
+  [cross-origin-embedder-policy]
+    skip: true
+  [cross-origin-opener-policy]
+    skip: true
+  [infrastructure]
+    skip: false
+    [safe-passing-of-structured-data]
+      skip: false
+      [shared-array-buffers]
+        skip: true
+  [semantics]
+    skip: false
+    [document-metadata]
+      skip: false
+      [the-meta-element]
+        skip: false
+        [pragma-directives]
+          skip: false
+          [attr-meta-http-equiv-refresh]
+            skip: true
+    [embedded-content]
+      skip: false
+      [media-elements]
+        skip: false
+        [track]
+          skip: false
+          [track-element]
+            skip: false
+            [cors]
+              skip: true
+    [scripting-1]
+      skip: false
+      [the-script-element]
+        skip: false
+        [json-module]
+          skip: true
+        [moving-between-documents]
+          skip: true
+[js]
+  skip: false
+[mediasession]
+  skip: false
+[navigation-timing]
+  skip: false
+[old-tests]
+  skip: true
+  [submission]
+    skip: true
+[performance-timeline]
+  skip: false
+[permissions]
+  skip: false
+[quirks]
+  skip: false
+[referrer-policy]
+  skip: false
+  [gen]
+    skip: false
+    [srcdoc-inherit.http-rp]
+      skip: true
+    [srcdoc-inherit.meta]
+      skip: true
+    [srcdoc.meta]
+      skip: true
+[resource-timing]
+  skip: false
+[selection]
+  skip: false
+[streams]
+  skip: true
+  [readable-streams]
+    skip: false
+[subresource-integrity]
+  skip: false
+[touch-events]
+  skip: false
+[uievents]
+  skip: false
+[url]
+  skip: false
+[wasm]
+  skip: false
+[webaudio]
+  skip: false
+[WebCryptoAPI]
+  skip: false
+[webgl]
+  skip: false
+[webidl]
+  skip: false
+[webvr]
+  skip: false
+[webvtt]
+  skip: true
+  [api]
+    skip: false
+[webxr]
+  skip: false
+  [dom-overlay]
+    skip: true
+[webmessaging]
+  skip: false
+[websockets]
+  skip: false
+[webstorage]
+  skip: false
+[workers]
+  skip: false
+  [modules]
+    skip: true
+[xhr]
+  skip: false

tests/wpt/include.ini

@@ -1,54 +1,31 @@
 skip: true
 [_mozilla]
-  skip: false
+  skip: true
+  [css]
+    skip: false
   [mozilla]
     skip: false
-[_webgl]
-  skip: false
-[cookies]
-  skip: false
-  [samesite]
-    skip: true
-[cors]
-  skip: false
 [css]
   skip: true
-  [compositing]
-    skip: false
   [CSS2]
     skip: false
-    [linebox]
-      skip:false
-  [css-align]
-    skip: false
   [css-animations]
     skip: false
+  [css-masking]
+    [clip]
+      skip: false
   [css-backgrounds]
     skip: false
-  [css-borders]
+  [css-content]
     skip: false
   [css-color]
     skip: false
-  [css-conditional]
-    skip: false
   [css-flexbox]
     skip: false
-  [css-fonts]
-    skip: false
-  [css-images]
-    skip: false
-  [css-outline]
-    skip: false
-  [css-paint-api]
+  [css-logical]
     skip: false
   [css-position]
     skip: false
-  [css-style-attr]
-    skip: false
-  [css-text]
-    skip: false
-    [i18n]
-      skip: true
   [css-text-decor]
     skip: false
   [css-transforms]
@@ -57,8 +34,6 @@ skip: true
     skip: false
   [css-ui]
     skip: false
-  [css-values]
-    skip: false
   [css-variables]
     skip: false
   [cssom]
@@ -67,143 +42,3 @@ skip: true
     skip: false
   [filter-effects]
     skip: false
-  [geometry]
-    skip: false
-  [mediaqueries]
-    skip: false
-  [selectors]
-    skip: false
-[custom-elements]
-  skip: false
-[dom]
-  skip: false
-[domparsing]
-  skip: false
-[encoding]
-  skip: false
-[eventsource]
-  skip: false
-[fetch]
-  skip: false
-[FileAPI]
-  skip: false
-[fullscreen]
-  skip: false
-[gamepad]
-  skip: false
-[hr-time]
-  skip: false
-[html]
-  skip: false
-  [cross-origin-embedder-policy]
-    skip: true
-  [cross-origin-opener-policy]
-    skip: true
-  [infrastructure]
-    skip: false
-    [safe-passing-of-structured-data]
-      skip: false
-      [shared-array-buffers]
-        skip: true
-  [semantics]
-    skip: false
-    [document-metadata]
-      skip: false
-      [the-meta-element]
-        skip: false
-        [pragma-directives]
-          skip: false
-          [attr-meta-http-equiv-refresh]
-            skip: true
-    [embedded-content]
-      skip: false
-      [media-elements]
-        skip: false
-        [track]
-          skip: false
-          [track-element]
-            skip: false
-            [cors]
-              skip: true
-    [scripting-1]
-      skip: false
-      [the-script-element]
-        skip: false
-        [json-module]
-          skip: true
-        [moving-between-documents]
-          skip: true
-[js]
-  skip: false
-[mediasession]
-  skip: false
-[navigation-timing]
-  skip: false
-[old-tests]
-  skip: true
-  [submission]
-    skip: true
-[performance-timeline]
-  skip: false
-[permissions]
-  skip: false
-[quirks]
-  skip: false
-[referrer-policy]
-  skip: false
-  [gen]
-    skip: false
-    [srcdoc-inherit.http-rp]
-      skip: true
-    [srcdoc-inherit.meta]
-      skip: true
-    [srcdoc.meta]
-      skip: true
-[resource-timing]
-  skip: false
-[selection]
-  skip: false
-[streams]
-  skip: true
-  [readable-streams]
-    skip: false
-[subresource-integrity]
-  skip: false
-[touch-events]
-  skip: false
-[uievents]
-  skip: false
-[url]
-  skip: false
-[wasm]
-  skip: false
-[webaudio]
-  skip: false
-[WebCryptoAPI]
-  skip: false
-[webgl]
-  skip: false
-[webidl]
-  skip: false
-[webvr]
-  skip: false
-[webvtt]
-  skip: true
-  [api]
-    skip: false
-[webxr]
-  skip: false
-  [dom-overlay]
-    skip: true
-[webmessaging]
-  skip: false
-[websockets]
-  skip: false
-[webstorage]
-  skip: false
-[workers]
-  skip: false
-  [modules]
-    skip: true
-[xhr]
-  skip: false