From 516cc2cbca55a1d1505a494875d0c2022ac314c2 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Tue, 2 Jan 2024 07:14:51 +0100 Subject: tidy: A few small improvements and fixes (#30941) 1. Make the tidy output easier to follow 2. Integrate the WPT manifest cleanliness step into tidy itself and don't run it if nothing has changed in the WPT directory. 3. Fix an issue where Python test requirements were not installed, which could cause issues with some modules not being found. Fixes #30002. --- python/mach_bootstrap.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'python/mach_bootstrap.py') diff --git a/python/mach_bootstrap.py b/python/mach_bootstrap.py index 53f7adb3fc4..6b638d8e905 100644 --- a/python/mach_bootstrap.py +++ b/python/mach_bootstrap.py @@ -14,8 +14,9 @@ from tempfile import TemporaryFile SCRIPT_PATH = os.path.abspath(os.path.dirname(__file__)) TOP_DIR = os.path.abspath(os.path.join(SCRIPT_PATH, "..")) WPT_PATH = os.path.join(TOP_DIR, "tests", "wpt") -WPT_RUNNER_PATH = os.path.join(WPT_PATH, "tests", "tools", "wptrunner") -WPT_SERVE_PATH = os.path.join(WPT_PATH, "tests", "tools", "wptserve") +WPT_TOOLS_PATH = os.path.join(WPT_PATH, "tests", "tools") +WPT_RUNNER_PATH = os.path.join(WPT_TOOLS_PATH, "wptrunner") +WPT_SERVE_PATH = os.path.join(WPT_TOOLS_PATH, "wptserve") SEARCH_PATHS = [ os.path.join("python", "mach"), @@ -162,6 +163,7 @@ def _activate_virtualenv(topdir): # and it will check for conflicts. requirements_paths = [ os.path.join("python", "requirements.txt"), + os.path.join(WPT_TOOLS_PATH, "requirements_tests.txt",), os.path.join(WPT_RUNNER_PATH, "requirements.txt",), ] -- cgit v1.2.3