solenv/gbuild/CppunitTest.mk | 2 +- solenv/gbuild/PythonTest.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit 6b6f51dceefc70f09e7ce8f34649b53591064723 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed May 8 16:02:45 2013 +0200 Set Valgrind-related env vars in PythonTest, too Change-Id: Ic0eddb6f332bcf139a5de8b1bf4084cb111cd040 diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index 9b450e7..eaa8757 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -38,6 +38,8 @@ $(call gb_PythonTest_get_target,%) : $(if $(value gb_CppunitTest_postprocess), \ rm -fr $@.core && mkdir $@.core && cd $@.core &&)) \ ($(gb_PythonTest_PRECOMMAND) \ + $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \ + $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \ URE_BOOTSTRAP=vnd.sun.star.pathname:$(gb_DEVINSTALLROOT)/program/fundamentalrc \ PYTHONPATH=$(PYPATH) \ UserInstallation="$(call gb_Helper_make_url,$(OUTDIR)/unittest)" \ commit 5f54e19ea489428e21b668fb390b82e7ed73e21a Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed May 8 15:59:43 2013 +0200 valgrind --trace-children=yes ...at least needed for PythonTest on Linux with internal python, where the valgrind'ed gb_Python_INSTALLED_EXECUTABLE is /bin/sh $(gb_DEVINSTALLROOT)/program/python. Also, remove --quiet again to avoid frustration ("when valgrind /is/ run, why doesn't it output any "==" lines at all?"). Change-Id: Id83e53f2b472b5af92e4aaec0c173ecdec45bc48 diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 3daa202..07dacbf 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -43,7 +43,7 @@ gb_CppunitTest__interactive := $(true) endif ifneq ($(strip $(VALGRIND)),) -gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 --error-exitcode=1 --quiet --leak-check=no +gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 --error-exitcode=1 --trace-children=yes --leak-check=no ifeq ($(strip $(VALGRIND)),memcheck) G_SLICE := always-malloc GLIBCXX_FORCE_NEW := 1 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits