xfs/013: use killall -9 and wait in _cleanup()
authorBrian Foster <bfoster@redhat.com>
Thu, 15 May 2014 01:37:49 +0000 (11:37 +1000)
committerDave Chinner <david@fromorbit.com>
Thu, 15 May 2014 01:37:49 +0000 (11:37 +1000)
Kill any lingering fsstress processes and wait properly should we abort
the test. This prevents the workload from inadvertently affecting
subsequent tests.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
tests/xfs/013

index 049f0dcbd2f116eaea9de0507f32fb29739769a8..e95d0271f8ee9e819e27d5cbaa87fda93b484522 100755 (executable)
@@ -40,7 +40,8 @@ status=1      # failure is the default!
 
 _cleanup()
 {
 
 _cleanup()
 {
-       killall fsstress 2>/dev/null
+       killall -9 fsstress 2>/dev/null
+       wait
        cd /
        umount $SCRATCH_MNT 2>/dev/null
        rm -f $tmp.*
        cd /
        umount $SCRATCH_MNT 2>/dev/null
        rm -f $tmp.*