]> git-server-git.apps.pok.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
check: unbreak iam
authorDarrick J. Wong <djwong@kernel.org>
Wed, 21 May 2025 22:42:38 +0000 (15:42 -0700)
committerZorro Lang <zlang@kernel.org>
Fri, 23 May 2025 13:43:29 +0000 (21:43 +0800)
I don't know why this change was made:

iam=check

to

iam=check.$$

The only users of this variable are:

check:36:iam=check
check:52:rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out $tmp.report.* $tmp.arglist
common/btrfs:216:               if [ "$iam" != "check" ]; then
common/overlay:407:             if [ "$iam" != "check" ]; then
common/rc:3565: if [ "$iam" != "check" ]; then
common/xfs:1021:                if [ "$iam" != "check" ]; then
new:9:iam=new

None of them were ported to notice the pid.  Consequently,
_check_generic_filesystem (aka _check_test_fs on an ext4 filesystem)
failing will cause ./check to exit the entire test suite when the test
filesystem is corrupt.  That's not what we wanted, particularly since
Leah added a patch to repair the test filesystem between tests.

Cc: fstests@vger.kernel.org # v2024.12.08
Fixes: fa0e9712283f0b ("fstests: check-parallel")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>
check

diff --git a/check b/check
index ede54f6987bcc3a747ce9bf4b7ac5b22acb90d00..826641268f8b52ddc7370ea4c5e0f47b222c02e9 100755 (executable)
--- a/check
+++ b/check
@@ -33,7 +33,7 @@ exclude_tests=()
 _err_msg=""
 
 # start the initialisation work now
-iam=check.$$
+iam=check
 
 # mkfs.xfs uses the presence of both of these variables to enable formerly
 # supported tiny filesystem configurations that fstests use for fuzz testing