diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-13 08:37:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-13 08:37:30 +0300 |
| commit | ffe5b92325a2a75d691adfacac9b8259e5e6d577 (patch) | |
| tree | 4ad0501d8aadcbdbf493b3f5af098797cc424ae6 | |
| parent | 6873f47edea909061389b3d9037f8cdfed9b9231 (diff) | |
PyDoc: disable ASAN exit code for doc building
Prevented docs from building on any minor issue when ASAN was enabled.
| -rw-r--r-- | GNUmakefile | 1 | ||||
| -rwxr-xr-x | doc/python_api/sphinx_doc_gen.sh | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index 26d931ae664..13f8a558c3a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -455,6 +455,7 @@ update: .FORCE # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation. doc_py: .FORCE + ASAN_OPTIONS=halt_on_error=0 \ $(BLENDER_BIN) --background -noaudio --factory-startup \ --python doc/python_api/sphinx_doc_gen.py cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out diff --git a/doc/python_api/sphinx_doc_gen.sh b/doc/python_api/sphinx_doc_gen.sh index d7420f99070..eba9e1ce5fa 100755 --- a/doc/python_api/sphinx_doc_gen.sh +++ b/doc/python_api/sphinx_doc_gen.sh @@ -58,7 +58,10 @@ SPHINX_WORKDIR="$(mktemp --directory --suffix=.sphinx)" # Generate reStructuredText (blender/python only) if $DO_EXE_BLENDER ; then - # don't delete existing docs, now partial updates are used for quick builds. + # Don't delete existing docs, now partial updates are used for quick builds. + # + # Disable ASAN error halt since it results in nonzero exit code on any minor issue. + ASAN_OPTIONS=halt_on_error=0 \ $BLENDER_BIN \ --background \ -noaudio \ |