]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
m4/dovecot.m4 - Apply DRY principle to test output filename
authorPhil Carmody <phil@dovecot.fi>
Wed, 29 Aug 2018 11:57:45 +0000 (14:57 +0300)
committerTimo Sirainen <timo.sirainen@open-xchange.com>
Fri, 15 Feb 2019 12:48:56 +0000 (12:48 +0000)
Define the name we will use for the file once, then just use that variable
instead of using explicit repeatition.

Signed-off-by: Phil Carmody <phil@dovecot.fi>
m4/dovecot.m4

index 2cf61bfd6ecf792c35a9b70df17dc5177f64e86e..149105e9c640ff08e7d742847d00647cf31e9b94 100644 (file)
@@ -285,16 +285,17 @@ if test "\$NOVALGRIND" != ""; then
   \$[*]
   ret=\$?
 else
-  trap "rm -f test.out.\$\$" 0 1 2 3 15
+  test_out="test.out.\$\$"
+  trap "rm -f \$test_out" 0 1 2 3 15
   supp_path="\$top_srcdir/run-test-valgrind.supp"
   if test -r "\$supp_path"; then
-    valgrind -q --trace-children=yes --leak-check=full --suppressions="\$supp_path" --log-file=test.out.\$\$ \$noundef \$[*]
+    valgrind -q \$trace_children --leak-check=full --suppressions="\$supp_path" --log-file=\$test_out \$noundef \$[*]
   else
-    valgrind -q --trace-children=yes --leak-check=full --log-file=test.out.\$\$ \$noundef \$[*]
+    valgrind -q \$trace_children --leak-check=full --log-file=\$test_out \$noundef \$[*]
   fi
   ret=\$?
-  if test -s test.out.\$\$; then
-    cat test.out.\$\$
+  if test -s \$test_out; then
+    cat \$test_out
     ret=1
   fi
 fi