From b560e18c6216149e47c5208df2727b01ba2ce49b Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Mon, 11 Apr 2022 15:48:33 +1000 Subject: [PATCH] generic/019: kill background processes on interrupt If you ctrl-c generic/019, it leaves fsstress processes running. Kill them in the cleanup function so that they don't have to be manually killed after interrupting the test. While touching the _cleanup() function, make it do everything that the generic _cleanup function it overrides does and fix the indenting. [Eryu: unset fs_pid and fio_pid after wait] Signed-off-by: Dave Chinner Reviewed-by: David Disseldorp Reviewed-by: Zorro Lang Signed-off-by: Eryu Guan --- tests/generic/019 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/generic/019 b/tests/generic/019 index db56dac1e..854ba57de 100755 --- a/tests/generic/019 +++ b/tests/generic/019 @@ -53,8 +53,10 @@ stop_fail_scratch_dev() # Override the default cleanup function. _cleanup() { - disallow_fail_make_request - rm -f $tmp.* + kill $fs_pid $fio_pid &> /dev/null + disallow_fail_make_request + cd / + rm -r -f $tmp.* } RUN_TIME=$((20+10*$TIME_FACTOR)) @@ -138,6 +140,8 @@ _workout() kill $fs_pid &> /dev/null wait $fs_pid wait $fio_pid + unset $fs_pid + unset $fio_pid # We expect that broken FS still can be umounted run_check _scratch_unmount -- 2.50.1