From 95343c998a078b30ca83d2e1be40149f7f56fed7 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 8 May 2014 12:11:24 +0200
Subject: Disable rtl/alloc.h also for Helgrind

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

(limited to 'desktop/scripts')

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 6d5dc38f1164..26fb7767517b 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
-- 
cgit