diff options
| author | Ankit Meel <ankitjmeel@gmail.com> | 2021-01-29 11:43:26 +0300 |
|---|---|---|
| committer | Ankit Meel <ankitjmeel@gmail.com> | 2021-01-29 11:43:26 +0300 |
| commit | 27e2c5ab78317fd79a50980b77fa93af42f2243d (patch) | |
| tree | 9e4e0afb6a77404c2b33fcb0a304f2f6da8b0709 /doc/manpage | |
| parent | 16fab8ebc4c786ce673b7b02e37966a1200f4605 (diff) | |
Tests, docs: Use sanitizer options from environment too.
Don't overwrite environment variables that may
contain options like suppression files, symboliser etc.
It's similar to rBa181b156399a13fa429159112e30c8005d5e8a59
and rBA589d13408a60cbec34a8bc3cc798c586043743ae .
For Blender Add-ons repo, see the equivalent in D9816.
Reviewed By: Blendify
Differential Revision: https://developer.blender.org/D9815
Diffstat (limited to 'doc/manpage')
| -rwxr-xr-x | doc/manpage/blender.1.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/manpage/blender.1.py b/doc/manpage/blender.1.py index da83abe8442..150548072d5 100755 --- a/doc/manpage/blender.1.py +++ b/doc/manpage/blender.1.py @@ -52,10 +52,11 @@ outfilename = sys.argv[2] cmd = [blender_bin, "--help"] print(" executing:", " ".join(cmd)) +ASAN_OPTIONS = "exitcode=0:" + os.environ.get("ASAN_OPTIONS", "") blender_help = subprocess.run( - cmd, env={"ASAN_OPTIONS": "exitcode=0"}, check=True, stdout=subprocess.PIPE).stdout.decode(encoding="utf-8") + cmd, env={"ASAN_OPTIONS": ASAN_OPTIONS}, check=True, stdout=subprocess.PIPE).stdout.decode(encoding="utf-8") blender_version = subprocess.run( - [blender_bin, "--version"], env={"ASAN_OPTIONS": "exitcode=0"}, check=True, stdout=subprocess.PIPE).stdout.decode(encoding="utf-8").strip() + [blender_bin, "--version"], env={"ASAN_OPTIONS": ASAN_OPTIONS}, check=True, stdout=subprocess.PIPE).stdout.decode(encoding="utf-8").strip() blender_version, blender_date = (blender_version.split("build") + [None, None])[0:2] blender_version = blender_version.rstrip().partition(" ")[2] # remove 'Blender' prefix. if blender_date is None: |