[Libreoffice-commits] .: solenv/inc

[Caolán McNamara]

 solenv/inc/settings.mk |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 721284d45d88379bcb69bd69d05bbf4a43df668b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 14 20:14:19 2011 +0000

    set VALGRIND=memcheck to run unit test under valgrind

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index bd4673f..a8ad20d 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1044,9 +1044,16 @@ EXTMAXPROCESS*=$(MAXPROCESS)
 
 GDBTRACE=gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace --args
 
+#use with export VALGRIND=memcheck, that method of invocation is used because
+#hunspell will aslo run its own unit tests under valgrind when this variable is
+#set.
+.IF "$(VALGRIND)" != ""
+VALGRINDTOOL=valgrind --tool=$(VALGRIND) --leak-check=yes
+.ENDIF
+
 IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/idlc
-REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regmerge
-REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcompare
+REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(VALGRINDTOOL) $(SOLARBINDIR)/regmerge
+REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(VALGRINDTOOL) $(SOLARBINDIR)/regcompare
 
 .IF "$(DEBUGREGCOMP)" != "" || "$(debugregcomp)" != ""
 GDBREGCOMPTRACE=$(GDBTRACE)
@@ -1062,7 +1069,7 @@ CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
 GDBCPPUNITTRACE=$(GDBTRACE)
 .ENDIF
 
-CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(SOLARBINDIR)/cppunittester
+CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(SOLARBINDIR)/cppunittester
 HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
 LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
 HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker