From 745d7315548555cd2be1370e611a8fd8f9278e36 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Fri, 2 Feb 2018 18:33:49 +0100
Subject: [PATCH] Add support for running valgrind tests with
 --trace-children=no.

---
 m4/dovecot.m4 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/m4/dovecot.m4 b/m4/dovecot.m4
index 810aa40217..e7872c5183 100644
--- a/m4/dovecot.m4
+++ b/m4/dovecot.m4
@@ -45,6 +45,12 @@ else
   noundef=""
 fi
 
+if test "\$NOCHILDREN" != ""; then
+  trace_children="--trace-children=no"
+else
+  trace_children="--trace-children=yes"
+fi
+
 if test "\$NOVALGRIND" != ""; then
   \$[*]
   ret=\$?
@@ -52,9 +58,9 @@ else
   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