mirror of
https://github.com/servo/servo.git
synced 2025-06-06 08:35:43 +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>
70 lines
816 B
Text
70 lines
816 B
Text
/.servo
|
|
/.cargo/*
|
|
!/.cargo/config.*
|
|
/.rustup
|
|
/.servobuild
|
|
/.wpt
|
|
/.vs
|
|
/android-toolchains
|
|
/target
|
|
/tests/wpt/reftests-report/report.html
|
|
/python/_virtualenv*
|
|
/python/_venv*
|
|
/python/tidy/servo_tidy.egg-info
|
|
/tests/wpt/sync
|
|
/tests/wpt/**/**/.cache/
|
|
/tests/dromaeo/dromaeo
|
|
*.pkl
|
|
*.pyc
|
|
*.swp
|
|
*.swo
|
|
*.csv
|
|
*.rej
|
|
*.orig
|
|
.coverage
|
|
.DS_Store
|
|
Servo.app
|
|
servo.pftrace
|
|
.config.mk.last
|
|
/glfw
|
|
webrender-captures/
|
|
/screenshots
|
|
|
|
# Allow CSV files to be used as resources in tests
|
|
!/tests/**/*.csv
|
|
|
|
# Editors
|
|
## IntelliJ
|
|
.idea
|
|
*.iws
|
|
*.iml
|
|
|
|
## Gradle
|
|
.gradle
|
|
|
|
## VSCode
|
|
.vscode
|
|
!/.vscode/extensions.json
|
|
!/.vscode/settings.json
|
|
|
|
## Emacs
|
|
*~
|
|
.#*
|
|
\#*
|
|
\#*\#
|
|
|
|
## Vim
|
|
Session.vim
|
|
Sessionx.vim
|
|
|
|
/unminified-js
|
|
/unminified-css
|
|
|
|
# Layout debugger trace files
|
|
layout_trace*
|
|
|
|
# Package managers
|
|
support/macos/Brewfile.lock.json
|
|
|
|
# direnv
|
|
.envrc
|