From: Carl Hetherington <cth@carlh.net>
Date: Fri, 14 Feb 2014 14:00:53 +0000 (+0000)
Subject: Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
X-Git-Tag: v2.0.48~905^2~25
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=dd9dfb4ff1fa5920193808123844300a94b2b0b1;hp=ebc8b9157e51b206692c9e3822c8c02fa999db67;p=dcpomatic.git

Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic
---

diff --git a/run/dcpomatic_batch b/run/dcpomatic_batch
index 78ee8f7be..80cf5291c 100755
--- a/run/dcpomatic_batch
+++ b/run/dcpomatic_batch
@@ -7,6 +7,9 @@ if [ "$1" == "--debug" ]; then
 elif [ "$1" == "--valgrind" ]; then
     shift
     valgrind --tool="memcheck" --suppressions=valgrind.supp --leak-check=full --show-reachable=yes build/src/tools/dcpomatic_batch $*
+elif [ "$1" == "--massif" ]; then
+    shift
+    valgrind --tool="massif" build/src/tools/dcpomatic_batch $*
 elif [ "$1" == "--callgrind" ]; then
     shift
     valgrind --tool="callgrind" build/src/tools/dcpomatic_batch $*