diff --git a/python/wpt/__init__.py b/python/wpt/__init__.py index 91760b84a27..9686df91ec2 100644 --- a/python/wpt/__init__.py +++ b/python/wpt/__init__.py @@ -33,9 +33,9 @@ def create_parser(): help="Run under chaos mode in rr until a failure is captured") parser.add_argument('--pref', default=[], action="append", dest="prefs", help="Pass preferences to servo") - parser.add_argument('--layout-2020', '--with-layout-2020', default=False, + parser.add_argument('--layout-2020', '--with-layout-2020', default=True, action="store_true", help="Use expected results for the 2020 layout engine") - parser.add_argument('--layout-2013', '--with-layout-2013', default=True, + parser.add_argument('--layout-2013', '--with-layout-2013', default=False, action="store_true", help="Use expected results for the 2013 layout engine") parser.add_argument('--log-servojson', action="append", type=mozlog.commandline.log_file, help="Servo's JSON logger of unexpected results") @@ -53,17 +53,16 @@ def create_parser(): def update_args_for_legacy_layout(kwargs: dict): - if kwargs.pop("layout_2020"): - 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" - ) + if kwargs.pop("layout_2013"): + 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" + ) def run_tests(): diff --git a/python/wpt/run.py b/python/wpt/run.py index 2b3cad5d563..558312164ed 100644 --- a/python/wpt/run.py +++ b/python/wpt/run.py @@ -103,7 +103,7 @@ def run_tests(**kwargs): kwargs.setdefault("binary_args", []) if prefs: kwargs["binary_args"] += ["--pref=" + pref for pref in prefs] - if not kwargs.get("layout_2020", False): + if kwargs.get("layout_2013"): kwargs["binary_args"] += ["--legacy-layout"] if not kwargs.get("no_default_test_types"): diff --git a/python/wpt/update.py b/python/wpt/update.py index 70b52b2acc3..73604140b6d 100644 --- a/python/wpt/update.py +++ b/python/wpt/update.py @@ -126,8 +126,8 @@ def run_update(**kwargs) -> bool: def create_parser(**_kwargs): parser = wptcommandline.create_parser_update() - parser.add_argument("--layout-2020", "--with-layout-2020", default=False, action="store_true", + parser.add_argument("--layout-2020", "--with-layout-2020", default=True, action="store_true", help="Use expected results for the 2020 layout engine") - parser.add_argument("--layout-2013", "--with-layout-2013", default=True, action="store_true", + parser.add_argument("--layout-2013", "--with-layout-2013", default=False, action="store_true", help="Use expected results for the 2013 layout engine") return parser