diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-03 07:55:24 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-03 07:55:24 -0800 |
commit | bd5eef58a21d54f256fed0734afe8cdce4ebb226 (patch) | |
tree | 255de1f5f9621cfb40bc6fda94201817c678b437 /python/servo/command_base.py | |
parent | c974b61d7fe3b63dc6ec81e52b7a4894f537e7a0 (diff) | |
parent | b5b76e80536c1245e9535980f6b00347f1dcd648 (diff) | |
download | servo-bd5eef58a21d54f256fed0734afe8cdce4ebb226.tar.gz servo-bd5eef58a21d54f256fed0734afe8cdce4ebb226.zip |
Auto merge of #14379 - kimsnj:run-headless, r=jdm
Use software rendering when running servo in headless mode
<!-- Please describe your changes on the following line: -->
Properly setting environment to use OsMesa in headless mode.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #13515
<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because I manually ran: `./mach run -d tests/html/about-mozilla.html -z`
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14379)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/command_base.py')
-rw-r--r-- | python/servo/command_base.py | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 8e239df8737..f43e4917dd3 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -209,6 +209,26 @@ def is_macosx(): return sys.platform == 'darwin' +def is_linux(): + return sys.platform.startswith('linux') + + +def set_osmesa_env(bin_path, env): + """Set proper LD_LIBRARY_PATH and DRIVE for software rendering on Linux and OSX""" + if is_linux(): + osmesa_path = path.join(find_dep_path_newest('osmesa-src', bin_path), "out", "lib", "gallium") + env["LD_LIBRARY_PATH"] = osmesa_path + env["GALLIUM_DRIVER"] = "softpipe" + elif is_macosx(): + osmesa_path = path.join(find_dep_path_newest('osmesa-src', bin_path), + "out", "src", "gallium", "targets", "osmesa", ".libs") + glapi_path = path.join(find_dep_path_newest('osmesa-src', bin_path), + "out", "src", "mapi", "shared-glapi", ".libs") + env["DYLD_LIBRARY_PATH"] = osmesa_path + ":" + glapi_path + env["GALLIUM_DRIVER"] = "softpipe" + return env + + class BuildNotFound(Exception): def __init__(self, message): self.message = message |