Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

wpt: check for wpt-prefs.json in "./servo" sub-directory (#33202)

Browse source 
The current working directory when running on WPT runners is not the
folder with the servo binary, but a parent folder into which the servo
nightly tar is extracted. This means the binary is `$PWD/servo/servo`
and resources directory in in `$PWD/servo/resources`, so the current
hardcoded relative path `resources/wpt-prefs.json` will not work on WPT
runners.

This is causing crashes in WPT runner:

https://github.com/web-platform-tests/wpt/runs/29284407168
https://community-tc.services.mozilla.com/tasks/J7MqNwJGQRSkIWlvB5ktPQ/runs/0/logs/live/public/logs/live.log

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
Mukilan Thiyagarajan 2024-08-27 13:34:12 +05:30 • committed by GitHub
parent 7fce24f9d5
commit 173b6f183c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/wpt/meta/MANIFEST.json vendored
View file

@ -490288,7 +490288,7 @@
[] []
], ],
"executorservo.py": [ "executorservo.py": [
"c23f7632c9ef5f0acbdbb569db41f741ccf9de89", "90251c1e4c6b6ffd150184005466aecdc76d180d",
[] []
], ],
"executorservodriver.py": [ "executorservodriver.py": [

17
tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservo.py vendored
View file

@ -38,6 +38,8 @@ class ServoExecutor(ProcessTestExecutor):
self.environment = {} self.environment = {}
self.protocol = ConnectionlessProtocol(self, browser) self.protocol = ConnectionlessProtocol(self, browser)
self.wpt_prefs_path = self.find_wpt_prefs()
hosts_fd, self.hosts_path = tempfile.mkstemp() hosts_fd, self.hosts_path = tempfile.mkstemp()
with os.fdopen(hosts_fd, "w") as f: with os.fdopen(hosts_fd, "w") as f:
f.write(make_hosts_file(server_config, "127.0.0.1")) f.write(make_hosts_file(server_config, "127.0.0.1"))
@ -64,6 +66,19 @@ class ServoExecutor(ProcessTestExecutor):
else: else:
self.logger.process_output(self.proc.pid, line, " ".join(self.command), self.test.url) self.logger.process_output(self.proc.pid, line, " ".join(self.command), self.test.url)
def find_wpt_prefs(self):
default_path = os.path.join("resources", "wpt-prefs.json")
# The cwd is the servo repo for `./mach test-wpt`, but on WPT runners
# it is the virtual environment where the nightly is extracted. In the
# latter case, the cwd has the `servo` folder inside which we find the
# binary and the 'resources' directory.
for dir in [".", "./servo"]:
candidate = os.path.abspath(os.path.join(dir, default_path))
if os.path.isfile(candidate):
return candidate
self.logger.error("Unable to find wpt-prefs.json")
return default_path
def build_servo_command(self, test, extra_args=None, debug_opts="replace-surrogates"): def build_servo_command(self, test, extra_args=None, debug_opts="replace-surrogates"):
args = [ args = [
"--hard-fail", "-u", "Servo/wptrunner", "--hard-fail", "-u", "Servo/wptrunner",
@ -78,7 +93,7 @@ class ServoExecutor(ProcessTestExecutor):
args += ["--user-stylesheet", stylesheet] args += ["--user-stylesheet", stylesheet]
for pref, value in self.environment.get('prefs', {}).items(): for pref, value in self.environment.get('prefs', {}).items():
args += ["--pref", f"{pref}={value}"] args += ["--pref", f"{pref}={value}"]
args += ["--prefs-file", "resources/wpt-prefs.json"] args += ["--prefs-file", self.wpt_prefs_path]
if self.browser.ca_certificate_path: if self.browser.ca_certificate_path:
args += ["--certificate-path", self.browser.ca_certificate_path] args += ["--certificate-path", self.browser.ca_certificate_path]
if extra_args: if extra_args: