diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2023-06-22 14:35:02 +0200 |
|---|---|---|
| committer | Martin Robinson <mrobinson@igalia.com> | 2023-06-22 21:15:41 +0200 |
| commit | f4578afdfe281db7d065a578782243248640aab5 (patch) | |
| tree | 48b01257f40e93e07e62413994372ffe5f2d2191 /python | |
| parent | cfd24f00bc14551845680713c68ce100404e4f1a (diff) | |
| download | servo-f4578afdfe281db7d065a578782243248640aab5.tar.gz servo-f4578afdfe281db7d065a578782243248640aab5.zip | |
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`
Diffstat (limited to 'python')
| -rw-r--r-- | python/wpt/__init__.py | 21 | ||||
| -rw-r--r-- | python/wpt/run.py | 4 | ||||
| -rw-r--r-- | python/wpt/update.py | 4 |
3 files changed, 15 insertions, 14 deletions
diff --git a/python/wpt/__init__.py b/python/wpt/__init__.py index a1ecf5001c3..a8276a506ce 100644 --- a/python/wpt/__init__.py +++ b/python/wpt/__init__.py @@ -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" + ) diff --git a/python/wpt/run.py b/python/wpt/run.py index 021331064e0..387ce2dbfe6 100644 --- a/python/wpt/run.py +++ b/python/wpt/run.py @@ -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, diff --git a/python/wpt/update.py b/python/wpt/update.py index 377ba06e3ce..a31598c09fb 100644 --- a/python/wpt/update.py +++ b/python/wpt/update.py @@ -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 |