Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-13 02:44:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename metadata directories

Browse source 
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`
This commit is contained in:
Martin Robinson 2023-06-22 14:35:02 +02:00
parent cfd24f00bc
commit f4578afdfe
No known key found for this signature in database
GPG key ID: D56AA4FA55EFE6F8
23708 changed files with 772645 additions and 694 deletions
Download patch file Download diff file Expand all files Collapse all files

21
python/wpt/__init__.py
View file

@ -50,14 +50,15 @@ def create_parser():
return parser
def update_args_for_layout_2020(kwargs: dict):
def update_args_for_legacy_layout(kwargs: dict):
if kwargs.pop("layout_2020"):
kwargs["test_paths"]["/"]["metadata_path"] = os.path.join(
WPT_PATH, "metadata-layout-2020"
)
kwargs["test_paths"]["/_mozilla/"]["metadata_path"] = os.path.join(
WPT_PATH, "mozilla", "meta-layout-2020"
)
kwargs["include_manifest"] = os.path.join(
WPT_PATH, "include-layout-2020.ini"
)
return
kwargs["test_paths"]["/"]["metadata_path"] = os.path.join(
WPT_PATH, "meta-legacy-layout"
)
kwargs["test_paths"]["/_mozilla/"]["metadata_path"] = os.path.join(
WPT_PATH, "mozilla", "meta-legacy-layout"
)
kwargs["include_manifest"] = os.path.join(
WPT_PATH, "include-legacy-layout.ini"
)

4
python/wpt/run.py
View file

@ -18,7 +18,7 @@ from typing import List, NamedTuple, Optional, Union
import mozlog
import mozlog.formatters
from . import SERVO_ROOT, WPT_PATH, WPT_TOOLS_PATH, update_args_for_layout_2020
from . import SERVO_ROOT, WPT_PATH, WPT_TOOLS_PATH, update_args_for_legacy_layout
from .grouping_formatter import (
ServoFormatter, ServoHandler,
UnexpectedResult, UnexpectedSubtestResult
@ -116,7 +116,7 @@ def run_tests(**kwargs):
raw_log_outputs = kwargs.get("log_raw", [])
wptcommandline.check_args(kwargs)
update_args_for_layout_2020(kwargs)
update_args_for_legacy_layout(kwargs)
mozlog.commandline.log_formatters["servo"] = (
ServoFormatter,

4
python/wpt/update.py
View file

@ -5,7 +5,7 @@
import os
from . import WPT_PATH, update_args_for_layout_2020
from . import WPT_PATH, update_args_for_legacy_layout
from . import importer
@ -20,7 +20,7 @@ def update_tests(**kwargs):
kwargs["store_state"] = False
importer.check_args(kwargs)
update_args_for_layout_2020(kwargs)
update_args_for_legacy_layout(kwargs)
return 1 if not importer.run_update(**kwargs) else 0