Skip to content

Commit

Permalink
Make install-fonts a no-op, see what breaks.
Browse files Browse the repository at this point in the history
This squashes all the previous commits and syncs to HEAD to include the
lint rule PR (web-platform-tests#18877)
  • Loading branch information
LukeZielinski committed Sep 12, 2019
1 parent d20c307 commit e5eca96
Show file tree
Hide file tree
Showing 13 changed files with 159 additions and 1,249 deletions.
6 changes: 3 additions & 3 deletions .azure-pipelines.yml
Expand Up @@ -78,7 +78,7 @@ jobs:
- template: tools/ci/azure/pip_install.yml
parameters:
packages: virtualenv
- template: tools/ci/azure/install_fonts.yml
# - template: tools/ci/azure/install_fonts.yml
- template: tools/ci/azure/install_certs.yml
- template: tools/ci/azure/install_chrome.yml
- template: tools/ci/azure/install_firefox.yml
Expand Down Expand Up @@ -320,7 +320,7 @@ jobs:
- template: tools/ci/azure/pip_install.yml
parameters:
packages: virtualenv
- template: tools/ci/azure/install_fonts.yml
# - template: tools/ci/azure/install_fonts.yml
- template: tools/ci/azure/install_certs.yml
- template: tools/ci/azure/install_safari.yml
parameters:
Expand Down Expand Up @@ -355,7 +355,7 @@ jobs:
- template: tools/ci/azure/pip_install.yml
parameters:
packages: virtualenv
- template: tools/ci/azure/install_fonts.yml
# - template: tools/ci/azure/install_fonts.yml
- template: tools/ci/azure/install_certs.yml
- template: tools/ci/azure/install_safari.yml
- template: tools/ci/azure/update_hosts.yml
Expand Down
316 changes: 0 additions & 316 deletions infrastructure/assumptions/ahem-notref.html

This file was deleted.

320 changes: 0 additions & 320 deletions infrastructure/assumptions/ahem-ref.html

This file was deleted.

316 changes: 0 additions & 316 deletions infrastructure/assumptions/ahem.html

This file was deleted.

129 changes: 0 additions & 129 deletions infrastructure/assumptions/tools/ahem-generate-table.py

This file was deleted.

7 changes: 0 additions & 7 deletions infrastructure/assumptions/tools/build.sh

This file was deleted.

1 change: 0 additions & 1 deletion lint.whitelist
Expand Up @@ -842,4 +842,3 @@ AHEM SYSTEM FONT: css/vendor-imports/mozilla/mozilla-central-reftests/*
# PR (https://github.com/web-platform-tests/wpt/pull/18702)
AHEM SYSTEM FONT: infrastructure/assumptions/ahem-ref.html
AHEM SYSTEM FONT: infrastructure/assumptions/ahem.html

2 changes: 1 addition & 1 deletion tools/ci/azure/affected_tests.yml
Expand Up @@ -11,7 +11,7 @@ steps:
- template: pip_install.yml
parameters:
packages: virtualenv
- template: install_fonts.yml
#- template: install_fonts.yml
- template: install_certs.yml
- template: install_safari.yml
- template: update_hosts.yml
Expand Down
6 changes: 3 additions & 3 deletions tools/ci/azure/install_fonts.yml
@@ -1,5 +1,5 @@
steps:
#steps:
# Installig Ahem in /Library/Fonts instead of using --install-fonts is a
# workaround for https://github.com/web-platform-tests/wpt/issues/13803.
- script: sudo cp fonts/Ahem.ttf /Library/Fonts
displayName: 'Install Ahem font'
#- script: sudo cp fonts/Ahem.ttf /Library/Fonts
# displayName: 'Install Ahem font'
20 changes: 10 additions & 10 deletions tools/wptrunner/wptrunner/browsers/firefox_android.py
Expand Up @@ -56,7 +56,7 @@ def browser_kwargs(test_type, run_info_data, config, **kwargs):
"stylo_threads": kwargs["stylo_threads"],
"chaos_mode_flags": kwargs["chaos_mode_flags"],
"config": config,
"install_fonts": kwargs["install_fonts"],
# "install_fonts": kwargs["install_fonts"],
"tests_root": config.doc_root}


Expand Down Expand Up @@ -91,7 +91,7 @@ def __init__(self, logger, prefs_root, test_type, package_name="org.mozilla.geck
self.package_name = package_name
self.device_serial = device_serial
self.tests_root = kwargs["tests_root"]
self.install_fonts = kwargs["install_fonts"]
# self.install_fonts = kwargs["install_fonts"]
self.stackwalk_binary = kwargs["stackwalk_binary"]

def start(self, **kwargs):
Expand Down Expand Up @@ -136,14 +136,14 @@ def start(self, **kwargs):
"layout.testing.overlay-scrollbars.always-visible": True,
})

if self.install_fonts:
self.logger.debug("Copying Ahem font to profile")
font_dir = os.path.join(self.profile.profile, "fonts")
if not os.path.exists(font_dir):
os.makedirs(font_dir)
with open(os.path.join(self.tests_root, "fonts", "Ahem.ttf"), "rb") as src:
with open(os.path.join(font_dir, "Ahem.ttf"), "wb") as dest:
dest.write(src.read())
# if self.install_fonts:
# self.logger.debug("Copying Ahem font to profile")
# font_dir = os.path.join(self.profile.profile, "fonts")
# if not os.path.exists(font_dir):
# os.makedirs(font_dir)
# with open(os.path.join(self.tests_root, "fonts", "Ahem.ttf"), "rb") as src:
# with open(os.path.join(font_dir, "Ahem.ttf"), "wb") as dest:
# dest.write(src.read())

self.leak_report_file = None

Expand Down

0 comments on commit e5eca96

Please sign in to comment.