[Libreoffice-commits] core.git: desktop/scripts

[Stephan Bergmann]

 desktop/scripts/soffice.sh |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 95343c998a078b30ca83d2e1be40149f7f56fed7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 8 12:11:24 2014 +0200

    Disable rtl/alloc.h also for Helgrind
    
    Change-Id: I472d11d50a3b0810779108f3f81624ab9880fe8b

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 6d5dc38..26fb776 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -107,10 +107,12 @@ for arg in $@ $VALGRINDOPT ; do
                 VALGRINDCHECK="valgrind --tool=$VALGRIND --trace-children=yes $valgrind_skip --num-callers=50 --error-limit=no"
                 echo "use kill -SIGUSR2 pid to dump traces of active allocations"
                 checks="c$checks"
-                if [ "$VALGRIND" = "memcheck" ] ; then
+                case $VALGRIND in
+                helgrind|memcheck)
                     export G_SLICE=always-malloc
                     export GLIBCXX_FORCE_NEW=1
-                fi
+                    ;;
+                esac
             else
                 echo "Error: Can't find the tool \"valgrind\", --valgrind option will be ignored"
                 exit 1