fuzzy: clean up scrub stress programs quietly

In the cleanup function for online fsck stress test common code, send
SIGINT instead of SIGTERM to the fsstress and xfs_io processes to kill
them.  bash prints 'Terminated' to the golden output when children die
with SIGTERM, which can make a test fail, and we don't want a regular
cleanup function being the thing that prevents the test from passing.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/common/fuzzy b/common/fuzzy
index 979fa555153b640562917e127361932a19ecbee7..e52831560d2ae420a6b32eb238eb5d70873247c6 100644 (file)
--- a/common/fuzzy
+++ b/common/fuzzy
@@ -381,7 +381,9 @@ _require_xfs_stress_online_repair() {
 
 # Clean up after the loops in case they didn't do it themselves.
 _scratch_xfs_stress_scrub_cleanup() {
-       $KILLALL_PROG -TERM xfs_io fsstress >> $seqres.full 2>&1
+       # Send SIGINT so that bash won't print a 'Terminated' message that
+       # distorts the golden output.
+       $KILLALL_PROG -INT xfs_io fsstress >> $seqres.full 2>&1
        $XFS_IO_PROG -x -c 'thaw' $SCRATCH_MNT >> $seqres.full 2>&1
 }