diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /testing/web-platform/mach_commands.py | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/web-platform/mach_commands.py')
-rw-r--r-- | testing/web-platform/mach_commands.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/testing/web-platform/mach_commands.py b/testing/web-platform/mach_commands.py index b0943e365e..63455c0b71 100644 --- a/testing/web-platform/mach_commands.py +++ b/testing/web-platform/mach_commands.py @@ -111,7 +111,6 @@ class WebPlatformTestsRunnerSetup(MozbuildObject): def kwargs_firefox(self, kwargs): """Setup kwargs specific to running Firefox and other gecko browsers""" - import mozinfo from wptrunner import wptcommandline kwargs = self.kwargs_common(kwargs) @@ -144,15 +143,6 @@ class WebPlatformTestsRunnerSetup(MozbuildObject): if kwargs["install_fonts"] is None: kwargs["install_fonts"] = True - if ( - kwargs["install_fonts"] - and mozinfo.info["os"] == "win" - and mozinfo.info["os_version"] == "6.1" - ): - # On Windows 7 --install-fonts fails, so fall back to a Firefox-specific codepath - self.setup_fonts_firefox() - kwargs["install_fonts"] = False - if kwargs["preload_browser"] is None: kwargs["preload_browser"] = False |