mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
c6d7c5785a
wptrunner internally derives the path to the MANIFEST.json file from the `metadata_path` passed via `test_paths`. The current logic overrides only the `metadata_path`, leaving the manifest_path pointing at the wrong (non-legacy) layout's MANIFEST.json. In #34436 we observed that the recent WPT imports create a transient `.cache` diretory that wptrunner logic uses for optimization. This has not been observed until #34436 because a [recent bump in MANIFEST.json's schema version][1] triggered the creation of the cache. Because of the above issue with incorrect path and the fact that we *first* trigger `mach update-wpt` for legacy layout during WPT import, the MANIFEST.json of non-legacy layout gets incorrectly migrated during the invocation of `update-wpt` for legacy layout but the cache is still created under legacy-layout's path as it is not based on `manifest_path`. The subsequent invocation of `mach update-wpt` for non-legacy finds the MANIFEST.json already migrated so the `.cache` directory is not constucted. This change simply replaces the whole object using the wptrunner's `TestRoot` class constructor so that all derived paths are calculated correctly. We also add the `.cache` folders to gitignore as it seems like they are expected to be created during such version migrations. [1]: https://github.com/web-platform-tests/wpt/pull/49406 Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
138 lines
4.2 KiB
TOML
138 lines
4.2 KiB
TOML
[configs]
|
|
skip-check-length = false
|
|
skip-check-licenses = false
|
|
check-alphabetical-order = true
|
|
check-ordered-json-keys = ["./resources/prefs.json"]
|
|
|
|
# Packages which we avoid using in Servo.
|
|
# For each blocked package, we can list the exceptions,
|
|
# which are packages allowed to use the blocked package.
|
|
[blocked-packages]
|
|
num = []
|
|
rand = [
|
|
"ipc-channel",
|
|
"phf_generator",
|
|
"quickcheck", # Only used in tests
|
|
"servo_rand",
|
|
"tungstenite",
|
|
"tracing-perfetto",
|
|
]
|
|
|
|
[ignore]
|
|
# Ignored packages with duplicated versions
|
|
packages = [
|
|
"bitflags",
|
|
"cfg_aliases",
|
|
"cookie",
|
|
"futures",
|
|
"hermit-abi",
|
|
"redox_syscall",
|
|
"time",
|
|
"wasi",
|
|
"wayland-sys",
|
|
|
|
# New versions of these dependencies is pulled in by GStreamer / GLib.
|
|
"itertools",
|
|
"toml",
|
|
|
|
# Duplicated by winit.
|
|
"windows-sys",
|
|
"windows-targets",
|
|
"windows_aarch64_gnullvm",
|
|
"windows_aarch64_msvc",
|
|
"windows_i686_gnu",
|
|
"windows_i686_msvc",
|
|
"windows_x86_64_gnu",
|
|
"windows_x86_64_gnullvm",
|
|
"windows_x86_64_msvc",
|
|
|
|
# wgpu has the latest and greatest.
|
|
"foreign-types",
|
|
"foreign-types-shared",
|
|
"metal",
|
|
"windows-core",
|
|
|
|
# wgpu-hal depends on 0.5.0.
|
|
"ndk-sys",
|
|
|
|
# quickcheck (required by layout_2020 for tests) is
|
|
# stuck on 0.8.4 with no new releases.
|
|
"env_logger",
|
|
|
|
# Required until a new version of string-cache is released.
|
|
"phf_generator",
|
|
"phf_shared",
|
|
|
|
# icu (from mozjs) uses old version
|
|
# tracing-subscriber (tokio-rs/tracing#3033) uses old version
|
|
# regex -> regex-automata 0.4.7
|
|
# icu_list -> regex-automata 0.2.0
|
|
# tracing-subscriber -> matchers -> regex-automata 0.1.0
|
|
"regex-automata",
|
|
|
|
# tracing-subscriber (tokio-rs/tracing#3033) uses old version
|
|
# regex [-> regex-automata 0.4.7] -> regex-syntax 0.8.4
|
|
# tracing-subscriber -> matchers -> regex-automata 0.1.0 -> regex-syntax 0.6.29
|
|
"regex-syntax",
|
|
|
|
# gilrs is on 0.10.0, but Servo is still on 0.9.4
|
|
"core-foundation",
|
|
|
|
# some non-servo crates still use 0.14
|
|
"glow",
|
|
]
|
|
# Files that are ignored for all tidy and lint checks.
|
|
files = [
|
|
"./components/net/tests/parsable_mime/text",
|
|
"./resources/hsts_preload.json",
|
|
"./tests/wpt/meta/MANIFEST.json",
|
|
"./tests/wpt/meta-legacy-layout/MANIFEST.json",
|
|
"./tests/wpt/mozilla/meta/MANIFEST.json",
|
|
"./tests/wpt/mozilla/meta-legacy-layout/MANIFEST.json",
|
|
# Long encoded string
|
|
"./tests/wpt/mozilla/tests/mozilla/resources/brotli.py",
|
|
"./tests/wpt/webgl/meta/MANIFEST.json",
|
|
# Upstream code from Khronos/WebGL uses tabs for indentation
|
|
"./tests/wpt/webgl/tests",
|
|
# Vendored from upstream
|
|
"./tests/wpt/webgpu/tests",
|
|
# Our import script is not currently respecting the lint.
|
|
"./tests/wpt/webgl/tools/import-conformance-tests.py",
|
|
# Ignore those files since the issues reported are on purpose
|
|
"./tests/html/bad-line-ends.html",
|
|
"./tests/wpt/mozilla/tests/css/fonts",
|
|
"./tests/wpt/mozilla/tests/css/pre_with_tab.html",
|
|
"./tests/wpt/mozilla/tests/mozilla/textarea_placeholder.html",
|
|
# The tidy tests currently don't pass tidy.
|
|
"./python/tidy/test.py",
|
|
]
|
|
# Directories that are ignored for the non-WPT tidy check.
|
|
directories = [
|
|
# Test have expectations in them, causing tidy to fail.
|
|
"./support/crown/tests",
|
|
# Upstream
|
|
"./support/android/apk",
|
|
"./tests/wpt/harness",
|
|
"./tests/wpt/tests",
|
|
"./tests/wpt/mozilla/tests/mozilla/referrer-policy",
|
|
"./tests/wpt/mozilla/tests/webgl",
|
|
"./python/tidy/tests",
|
|
"./python/_v*",
|
|
"./python/mach",
|
|
# Generated and upstream code combined with our own. Could use cleanup
|
|
"./target",
|
|
"./support/crown/target",
|
|
"./third_party",
|
|
# Cache files generated by wptrunner which fail the EOF newlines check.
|
|
"./tests/wpt/meta/.cache",
|
|
"./tests/wpt/meta-legacy-layout/.cache",
|
|
"./tests/wpt/mozilla/meta/.cache",
|
|
"./tests/wpt/mozilla/meta-legacy-layout/.cache",
|
|
"./tests/wpt/webgl/meta/.cache",
|
|
"./tests/wpt/webgl/meta-legacy-layout/.cache",
|
|
]
|
|
|
|
# Directories that are checked for correct file extension
|
|
[check_ext]
|
|
# directory, list of expected file extensions
|
|
"./components/script/dom/webidls" = [".webidl", "noidl"]
|