From 8e5bf2d06fdc9b9b3def05f6c37676e4659cbd65 Mon Sep 17 00:00:00 2001 From: Qu Wenruo Date: Wed, 18 Sep 2019 14:56:25 +0800 Subject: [PATCH] btrfs/028: Don't pollute golden output for killing already finished process Sometimes on fast enough test vm, btrfs/028 fails like: btrfs/028 31s ... - output mismatch (see /home/adam/xfstests-dev/results//btrfs/028.out.bad) --- tests/btrfs/028.out 2019-07-22 14:13:44.646666660 +0800 +++ /home/adam/xfstests-dev/results//btrfs/028.out.bad 2019-09-18 14:14:45.442131411 +0800 @@ -1,2 +1,3 @@ QA output created by 028 +/home/adam/xfstests-dev/tests/btrfs/028: line 64: kill: (2459) - No such process Silence is golden ... It's caused by killing already finished process. There is no need for kill command to pollute the golden output, so just redirect all of its stdout and stderr to null. Signed-off-by: Qu Wenruo Reviewed-by: Anand Jain Signed-off-by: Eryu Guan --- tests/btrfs/028 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/btrfs/028 b/tests/btrfs/028 index efa87ab3..98b9c8b9 100755 --- a/tests/btrfs/028 +++ b/tests/btrfs/028 @@ -61,7 +61,7 @@ balance_pid=$! # 30s is enough to trigger bug sleep $((30*$TIME_FACTOR)) -kill $fsstress_pid $balance_pid +kill $fsstress_pid $balance_pid &> /dev/null wait # kill _btrfs_stress_balance can't end balance, so call btrfs balance cancel -- 2.30.2