зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1555212 - Make wpt --product install the dependencies in the mach layer, r=ato
This avoids a mismatch in the available arguments between upstream pip and the version vendored into m-c at the cost of the code being more liable to break when upstream changes. Differential Revision: https://phabricator.services.mozilla.com/D32991 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
8710fd9939
Коммит
4490fed96d
|
@ -136,9 +136,24 @@ class WebPlatformTestsRunnerSetup(MozbuildObject):
|
|||
kwargs["prompt"] = True
|
||||
kwargs["install_browser"] = False
|
||||
|
||||
# Install the deps
|
||||
# We do this explicitly to avoid calling pip with options that aren't
|
||||
# supported in the in-tree version
|
||||
wptrunner_path = os.path.join(self._here, "tests", "tools", "wptrunner")
|
||||
browser_cls = run.product_setup[kwargs["product"]].browser_cls
|
||||
requirements = ["requirements.txt"]
|
||||
if hasattr(browser_cls, "requirements"):
|
||||
requirements.append(browser_cls.requirements)
|
||||
|
||||
for filename in requirements:
|
||||
path = os.path.join(wptrunner_path, filename)
|
||||
if os.path.exists(path):
|
||||
self.virtualenv_manager.install_pip_requirements(path, require_hashes=False)
|
||||
|
||||
venv = run.virtualenv.Virtualenv(self.virtualenv_manager.virtualenv_root,
|
||||
skip_virtualenv_setup=True)
|
||||
try:
|
||||
kwargs = run.setup_wptrunner(run.virtualenv.Virtualenv(self.virtualenv_manager.virtualenv_root, False),
|
||||
**kwargs)
|
||||
kwargs = run.setup_wptrunner(venv, **kwargs)
|
||||
except run.WptrunError as e:
|
||||
print(e.message, file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
|
Загрузка…
Ссылка в новой задаче