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

Auto merge of #25350 - jdm:wpt-debug-help, r=asajeffrey

Browse source 
Print OSMesa environment variables when starting debugger under WPT.

This helps with #25231 by making it easy to set the appropriate environment variables inside lldb before running a headless debugging session.
This commit is contained in:
bors-servo 2019-12-20 17:35:18 -05:00 • committed by GitHub
commit bb5cd02da3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python/servo/command_base.py
View file

@ -222,7 +222,7 @@ def append_to_path_env(string, env, name):
env[name] = variable env[name] = variable
def set_osmesa_env(bin_path, env): def set_osmesa_env(bin_path, env, show_vars):
"""Set proper LD_LIBRARY_PATH and DRIVE for software rendering on Linux and OSX""" """Set proper LD_LIBRARY_PATH and DRIVE for software rendering on Linux and OSX"""
if is_linux(): if is_linux():
dep_path = find_dep_path_newest('osmesa-src', bin_path) dep_path = find_dep_path_newest('osmesa-src', bin_path)
@ -231,6 +231,9 @@ def set_osmesa_env(bin_path, env):
osmesa_path = path.join(dep_path, "out", "lib", "gallium") osmesa_path = path.join(dep_path, "out", "lib", "gallium")
append_to_path_env(osmesa_path, env, "LD_LIBRARY_PATH") append_to_path_env(osmesa_path, env, "LD_LIBRARY_PATH")
env["GALLIUM_DRIVER"] = "softpipe" env["GALLIUM_DRIVER"] = "softpipe"
if show_vars:
print("GALLIUM_DRIVER=" + env["GALLIUM_DRIVER"])
print("LD_LIBRARY_PATH=" + env["LD_LIBRARY_PATH"])
elif is_macosx(): elif is_macosx():
osmesa_dep_path = find_dep_path_newest('osmesa-src', bin_path) osmesa_dep_path = find_dep_path_newest('osmesa-src', bin_path)
if not osmesa_dep_path: if not osmesa_dep_path:
@ -241,6 +244,9 @@ def set_osmesa_env(bin_path, env):
"out", "src", "mapi", "shared-glapi", ".libs") "out", "src", "mapi", "shared-glapi", ".libs")
append_to_path_env(osmesa_path + ":" + glapi_path, env, "DYLD_LIBRARY_PATH") append_to_path_env(osmesa_path + ":" + glapi_path, env, "DYLD_LIBRARY_PATH")
env["GALLIUM_DRIVER"] = "softpipe" env["GALLIUM_DRIVER"] = "softpipe"
if show_vars:
print("GALLIUM_DRIVER=" + env["GALLIUM_DRIVER"])
print("DYLD_LIBRARY_PATH=" + env["DYLD_LIBRARY_PATH"])
return env return env

8
python/servo/testing_commands.py
View file

@ -197,7 +197,7 @@ class MachCommands(CommandBase):
@CommandArgument('--submit', '-a', default=False, action="store_true", @CommandArgument('--submit', '-a', default=False, action="store_true",
help="submit the data to perfherder") help="submit the data to perfherder")
def test_perf(self, base=None, date=None, submit=False): def test_perf(self, base=None, date=None, submit=False):
self.set_software_rendering_env(True) self.set_software_rendering_env(True, False)
self.ensure_bootstrapped() self.ensure_bootstrapped()
env = self.build_env() env = self.build_env()
@ -445,7 +445,7 @@ class MachCommands(CommandBase):
# Helper for test_css and test_wpt: # Helper for test_css and test_wpt:
def wptrunner(self, run_file, **kwargs): def wptrunner(self, run_file, **kwargs):
self.set_software_rendering_env(kwargs['release']) self.set_software_rendering_env(kwargs['release'], kwargs['debugger'])
# By default, Rayon selects the number of worker threads # By default, Rayon selects the number of worker threads
# based on the available CPU count. This doesn't work very # based on the available CPU count. This doesn't work very
@ -760,12 +760,12 @@ class MachCommands(CommandBase):
return check_call( return check_call(
[run_file, "|".join(tests), bin_path, base_dir]) [run_file, "|".join(tests), bin_path, base_dir])
def set_software_rendering_env(self, use_release): def set_software_rendering_env(self, use_release, show_vars):
# On Linux and mac, find the OSMesa software rendering library and # On Linux and mac, find the OSMesa software rendering library and
# add it to the dynamic linker search path. # add it to the dynamic linker search path.
try: try:
bin_path = self.get_binary_path(use_release, not use_release) bin_path = self.get_binary_path(use_release, not use_release)
if not set_osmesa_env(bin_path, os.environ): if not set_osmesa_env(bin_path, os.environ, show_vars):
print("Warning: Cannot set the path to OSMesa library.") print("Warning: Cannot set the path to OSMesa library.")
except BuildNotFound: except BuildNotFound:
# This can occur when cross compiling (e.g. arm64), in which case # This can occur when cross compiling (e.g. arm64), in which case