From: Amir Goldstein <amir73il@gmail.com>
To: Zorro Lang <zlang@redhat.com>
Cc: "Darrick J . Wong" <darrick.wong@oracle.com>,
Dave Chinner <david@fromorbit.com>,
fstests@vger.kernel.org
Subject: [PATCH 3/4] xfs/{422,517}: add missing killall to _cleanup()
Date: Sun, 19 Jun 2022 16:46:56 +0300 [thread overview]
Message-ID: <20220619134657.1846292-4-amir73il@gmail.com> (raw)
In-Reply-To: <20220619134657.1846292-1-amir73il@gmail.com>
Those tests failed to cleanup background jobs after test
is interrupted.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
tests/xfs/422 | 8 ++++++++
tests/xfs/517 | 1 +
2 files changed, 9 insertions(+)
diff --git a/tests/xfs/422 b/tests/xfs/422
index a83a66df..8e9a3576 100755
--- a/tests/xfs/422
+++ b/tests/xfs/422
@@ -13,6 +13,14 @@ _begin_fstest dangerous_scrub dangerous_online_repair freeze
_register_cleanup "_cleanup" BUS
+# Override the default cleanup function.
+_cleanup()
+{
+ $KILLALL_PROG -9 $XFS_IO_PROG $FSSTRESS_PROG > /dev/null 2>&1
+ cd /
+ rm -rf $tmp.*
+}
+
# Import common functions.
. ./common/filter
. ./common/fuzzy
diff --git a/tests/xfs/517 b/tests/xfs/517
index 961668e3..18404248 100755
--- a/tests/xfs/517
+++ b/tests/xfs/517
@@ -14,6 +14,7 @@ _register_cleanup "_cleanup" BUS
# Override the default cleanup function.
_cleanup()
{
+ $KILLALL_PROG -9 $XFS_IO_PROG $FSSTRESS_PROG > /dev/null 2>&1
cd /
rm -rf $tmp.*
}
--
2.25.1
next prev parent reply other threads:[~2022-06-19 13:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-19 13:46 [PATCH 0/4] aborted fstests may leave frozen fs behind Amir Goldstein
2022-06-19 13:46 ` [PATCH 1/4] fstests: add missing _require_freeze() to tests Amir Goldstein
2022-06-23 18:00 ` Darrick J. Wong
2022-06-24 4:05 ` Amir Goldstein
2022-06-24 6:27 ` Zorro Lang
2022-06-19 13:46 ` [PATCH 2/4] fstests: make sure to unfreeze test and scratch mounts Amir Goldstein
2022-06-20 11:17 ` Zorro Lang
2022-06-20 12:13 ` Amir Goldstein
2022-06-20 14:21 ` Zorro Lang
2022-06-20 15:08 ` Amir Goldstein
2022-06-20 22:34 ` Dave Chinner
2022-06-21 2:53 ` Amir Goldstein
2022-06-20 22:06 ` Dave Chinner
2022-06-21 2:57 ` Amir Goldstein
2022-06-19 13:46 ` Amir Goldstein [this message]
2022-06-21 4:02 ` [PATCH 3/4] xfs/{422,517}: add missing killall to _cleanup() Amir Goldstein
2022-06-23 18:04 ` Darrick J. Wong
2022-06-24 4:36 ` Amir Goldstein
2022-06-24 6:31 ` Zorro Lang
2022-06-24 6:41 ` Amir Goldstein
2022-06-24 15:09 ` Zorro Lang
2022-06-24 4:49 ` Delegating fstests maintenance work (Was: Re: [PATCH 3/4] xfs/{422,517}: add missing killall to _cleanup()) Amir Goldstein
2022-06-25 3:11 ` Darrick J. Wong
2022-06-19 13:46 ` [PATCH 4/4] xfs/{422,517}: fix false positive failure Amir Goldstein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220619134657.1846292-4-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
--cc=zlang@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox