[Bf-blender-cvs] [ffe5b92325a] master: PyDoc: disable ASAN exit code for doc building

Campbell Barton noreply at git.blender.org
Thu Sep 13 07:27:36 CEST 2018


Commit: ffe5b92325a2a75d691adfacac9b8259e5e6d577
Author: Campbell Barton
Date:   Thu Sep 13 15:37:30 2018 +1000
Branches: master
https://developer.blender.org/rBffe5b92325a2a75d691adfacac9b8259e5e6d577

PyDoc: disable ASAN exit code for doc building

Prevented docs from building on any minor issue when ASAN was enabled.

===================================================================

M	GNUmakefile
M	doc/python_api/sphinx_doc_gen.sh

===================================================================

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 \



More information about the Bf-blender-cvs mailing list