Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync WPT with upstream (24-10-2023) (#30607)

Browse source 
* wpt sync: adapt code for new TestRoot class

Fixes #30558

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

* temp change to allow wpt sync build to pass

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

* Update web-platform-tests to revision b'0d5028f200c8651b17bb224657d6e1065adcff37'

* Revert "temp change to allow wpt sync build to pass"

This reverts commit bad72c7f87.

* revert metadata update for intermittent timeouts

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

---------

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
Co-authored-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
Servo WPT Sync 2023-10-25 03:26:53 -04:00 • committed by GitHub
parent 1f961b9d38
commit 65beca94cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
814 changed files with 19834 additions and 4403 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/wpt/__init__.py
View file

@ -49,13 +49,13 @@ def create_parser():
def update_args_for_legacy_layout(kwargs: dict):
kwargs["test_paths"]["/"]["metadata_path"] = os.path.join(
kwargs["test_paths"]["/"].metadata_path = os.path.join(
WPT_PATH, "meta-legacy-layout"
)
kwargs["test_paths"]["/_mozilla/"]["metadata_path"] = os.path.join(
kwargs["test_paths"]["/_mozilla/"].metadata_path = os.path.join(
WPT_PATH, "mozilla", "meta-legacy-layout"
)
kwargs["test_paths"]["/_webgl/"]["metadata_path"] = os.path.join(
kwargs["test_paths"]["/_webgl/"].metadata_path = os.path.join(
WPT_PATH, "webgl", "meta-legacy-layout"
)

8
python/wpt/manifestupdate.py
View file

@ -51,10 +51,10 @@ def update(check_clean=True, rebuild=False, **kwargs):
def _update(logger, test_paths, rebuild):
for url_base, paths in iteritems(test_paths):
manifest_path = os.path.join(paths["metadata_path"], "MANIFEST.json")
manifest_path = os.path.join(paths.metadata_path, "MANIFEST.json")
cache_subdir = os.path.relpath(os.path.dirname(manifest_path),
os.path.dirname(__file__))
wptmanifest.manifest.load_and_update(paths["tests_path"],
wptmanifest.manifest.load_and_update(paths.tests_path,
manifest_path,
url_base,
working_copy=True,
@ -68,8 +68,8 @@ def _check_clean(logger, test_paths):
manifests_by_path = {}
rv = 0
for url_base, paths in iteritems(test_paths):
tests_path = paths["tests_path"]
manifest_path = os.path.join(paths["metadata_path"], "MANIFEST.json")
tests_path = paths.tests_path
manifest_path = os.path.join(paths.metadata_path, "MANIFEST.json")
old_manifest = wptmanifest.manifest.load_and_update(tests_path,
manifest_path,

2
python/wpt/update.py
View file

@ -109,7 +109,7 @@ def update_tests(**kwargs) -> int:
wptcommandline.set_from_config(kwargs)
if hasattr(wptcommandline, 'check_paths'):
wptcommandline.check_paths(kwargs)
wptcommandline.check_paths(kwargs["test_paths"])
if kwargs.pop("legacy_layout"):
update_args_for_legacy_layout(kwargs)