Move --child-silent-after-fork=yes from drd/tests/threaded-fork.vgtest to drd/tests...

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12161

diff --git a/drd/tests/threaded-fork.vgtest b/drd/tests/threaded-fork.vgtest
index b5ba3fb379ccbc643bf6f6d0b3fbbdabdbe0a5b9..94497290e28e7c3fde888e87e0358349555fede3 100644 (file)
--- a/drd/tests/threaded-fork.vgtest
+++ b/drd/tests/threaded-fork.vgtest
@@ -1,3 +1,2 @@
 prereq: ./supported_libpthread
-vgopts: --child-silent-after-fork=yes
 prog: threaded-fork

diff --git a/drd/tests/verify-xml-output b/drd/tests/verify-xml-output
index 7fbd4b24a4e9fc0008f3c7a0be6647fb850a3906..5bc4b105944a46f634169cb2b45d1a3d21450d0c 100755 (executable)
--- a/drd/tests/verify-xml-output
+++ b/drd/tests/verify-xml-output
@@ -16,7 +16,7 @@ do
   args="$(sed -n 's/^args: //p' $f)"
   vgopts="$(sed -n 's/^vgopts: //p' $f)"
   if eval $prereq; then
-    ../../vg-in-place --tool=drd --xml=yes --xml-file="$b-%q{USER}.xml" --xml-user-comment="<runBy>$(basename $0)</runBy>" --gen-suppressions=all $vgopts ./$prog $args
+    ../../vg-in-place --tool=drd --xml=yes --xml-file="$b-%q{USER}.xml" --xml-user-comment="<runBy>$(basename $0)</runBy>" --child-silent-after-fork=yes --gen-suppressions=all $vgopts ./$prog $args
     xmllint --noout --schema ../docs/drd-xml-output.xsd $b-${USER}.xml 2>&1 | tee $b.xmllint
   else
     echo "Skipping because $prereq failed"