shell: replace valgrind wrapper with environment variable

diff --git a/shell/bin/svalgrind b/shell/bin/svalgrind
deleted file mode 100755 (executable)
index bcb68da..0000000
--- a/shell/bin/svalgrind
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2011-2014  Simon Ruderich
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-set -eu
-
-exec valgrind --leak-check=full --show-reachable=yes --error-exitcode=1 \
-              --track-fds=yes --quiet "$@"

diff --git a/shell/shell/env b/shell/shell/env
index 1d36c1b2480b0d6d4ee825210773b859c140e4de..b3ff0c38079eed28e44ac7c0bb964fd85323a1a6 100644 (file)
--- a/shell/shell/env
+++ b/shell/shell/env
@@ -139,6 +139,15 @@ fi
 MTR_OPTIONS='--show-ips'
 export MTR_OPTIONS
 
+# Additional command line options for `valgrind`.
+VALGRIND_OPTS=
+VALGRIND_OPTS="$VALGRIND_OPTS --quiet"
+VALGRIND_OPTS="$VALGRIND_OPTS --error-exitcode=1"
+VALGRIND_OPTS="$VALGRIND_OPTS --memcheck:leak-check=full"
+VALGRIND_OPTS="$VALGRIND_OPTS --memcheck:show-reachable=yes"
+VALGRIND_OPTS="$VALGRIND_OPTS --memcheck:track-fds=yes"
+export VALGRIND_OPTS
+
 # Use short SSH timeout for Git commands so remote fetches/pushes fail
 # quickly. Thanks to ceddral for the idea.
 GIT_SSH_COMMAND='ssh -o ConnectTimeout=3'

diff --git a/shell/zsh/rc b/shell/zsh/rc
index 99e46af4cee67038b5aba1129637b555fca12e06..0f6e2e09dae0dffc6cfd6c728a3e581084f8b722 100644 (file)
--- a/shell/zsh/rc
+++ b/shell/zsh/rc
@@ -799,7 +799,6 @@ bindkey '^F' complete-files
 compdef slocate=locate
 compdef srsync=rsync
 compdef srsync-incremental=rsync
-compdef svalgrind=valgrind
 compdef sc=systemctl