From ef47c3da96788e4a18db5b8d0149168fd13e0f5e Mon Sep 17 00:00:00 2001 From: Phil Carmody Date: Wed, 29 Aug 2018 14:57:45 +0300 Subject: [PATCH] m4/dovecot.m4 - Apply DRY principle to test output filename 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 --- m4/dovecot.m4 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/m4/dovecot.m4 b/m4/dovecot.m4 index 464a7a32a5..5c78eea29c 100644 --- a/m4/dovecot.m4 +++ b/m4/dovecot.m4 @@ -60,16 +60,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 --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 --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