[PATCH 0/4 V2] fstests: fix test requirements for exfat testing support

[PATCH 0/4 V2] fstests: fix test requirements for exfat testing support

[Eric Sandeen]

Running xfstests over exfat reveals a lot of tests don't properly check
for filesystem capabilities before running, which leads to incorrect
failures.  This series fixes up several of those.

-Eric

[PATCH 1/4] fstests: rename _require_test_symlinks

[Eric Sandeen]

Generally these tests are not restricted to one device or the other;
testing the test device will suffice to determine the capability
but it doesn't need to be named that way.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

diff --git a/common/rc b/common/rc
index 24a8f145..31361d0e 100644
--- a/common/rc
+++ b/common/rc
@@ -3481,7 +3481,7 @@ run_check()
 	"$@" >> $seqres.full 2>&1 || _fail "failed: '$@'"
 }
 
-_require_test_symlinks()
+_require_symlinks()
 {
 	local target=`mktemp -p $TEST_DIR`
 	local link=`mktemp -p $TEST_DIR -u`
diff --git a/tests/generic/005 b/tests/generic/005
index 118fca20..c49109e9 100755
--- a/tests/generic/005
+++ b/tests/generic/005
@@ -48,7 +48,7 @@ _touch()
 # real QA test starts here
 _supported_fs generic
 _require_test
-_require_test_symlinks
+_require_symlinks
 
 _supported_os Linux
 
diff --git a/tests/generic/023 b/tests/generic/023
index ea40f3d2..1cfa25cd 100755
--- a/tests/generic/023
+++ b/tests/generic/023
@@ -30,7 +30,7 @@ _supported_os Linux
 
 _require_test
 _require_renameat2
-_require_test_symlinks
+_require_symlinks
 
 # real QA test starts here
 
diff --git a/tests/generic/024 b/tests/generic/024
index 531a515f..b6ac4182 100755
--- a/tests/generic/024
+++ b/tests/generic/024
@@ -30,7 +30,7 @@ _supported_os Linux
 
 _require_test
 _require_renameat2 noreplace
-_require_test_symlinks
+_require_symlinks
 
 # real QA test starts here
 
diff --git a/tests/generic/025 b/tests/generic/025
index e69d655f..2eb3e5e8 100755
--- a/tests/generic/025
+++ b/tests/generic/025
@@ -30,7 +30,7 @@ _supported_os Linux
 
 _require_test
 _require_renameat2 exchange
-_require_test_symlinks
+_require_symlinks
 
 # real QA test starts here
 
diff --git a/tests/generic/067 b/tests/generic/067
index bd72dc85..d4c710d2 100755
--- a/tests/generic/067
+++ b/tests/generic/067
@@ -37,7 +37,7 @@ _cleanup()
 # Modify as appropriate.
 _supported_fs generic
 _supported_os Linux
-_require_test_symlinks
+_require_symlinks
 _require_test
 _require_scratch
 _require_loop
diff --git a/tests/generic/078 b/tests/generic/078
index a421a8ab..ce0201c9 100755
--- a/tests/generic/078
+++ b/tests/generic/078
@@ -30,7 +30,7 @@ _supported_os Linux
 
 _require_test
 _require_renameat2 whiteout
-_require_test_symlinks
+_require_symlinks
 
 # real QA test starts here
 

[PATCH 2/4] fstests: use _require_symlinks on all necessary tests

[Eric Sandeen]

Consistently use _require_symlinks on all generic tests which
create a symlink when they run.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

diff --git a/tests/generic/062 b/tests/generic/062
index 3fef02e8..ba744885 100755
--- a/tests/generic/062
+++ b/tests/generic/062
@@ -59,6 +59,7 @@ _supported_os Linux
 
 _require_scratch
 _require_attrs
+_require_symlinks
 
 rm -f $tmp.backup1 $tmp.backup2 $seqres.full
 
diff --git a/tests/generic/109 b/tests/generic/109
index 8be70c23..549a95b1 100755
--- a/tests/generic/109
+++ b/tests/generic/109
@@ -29,6 +29,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_symlinks
 
 rm -f $seqres.full
 
diff --git a/tests/generic/294 b/tests/generic/294
index b74579ac..32c89b03 100755
--- a/tests/generic/294
+++ b/tests/generic/294
@@ -32,6 +32,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_symlinks
 
 rm -f $seqres.full
 _scratch_mkfs > $seqres.full 2>&1 || _fail "Could not mkfs scratch device"
diff --git a/tests/generic/306 b/tests/generic/306
index 081d1a89..046f4516 100755
--- a/tests/generic/306
+++ b/tests/generic/306
@@ -33,6 +33,7 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_test
+_require_symlinks
 
 DEVNULL=$SCRATCH_MNT/devnull
 DEVZERO=$SCRATCH_MNT/devzero
diff --git a/tests/generic/348 b/tests/generic/348
index 630ff160..e0139d9a 100755
--- a/tests/generic/348
+++ b/tests/generic/348
@@ -32,6 +32,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_symlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/360 b/tests/generic/360
index a9a4f2f9..f15548e2 100755
--- a/tests/generic/360
+++ b/tests/generic/360
@@ -31,6 +31,7 @@ rm -f $seqres.full
 _supported_fs generic
 _supported_os Linux
 _require_test
+_require_symlinks
 
 linkfile=$TEST_DIR/$seq.symlink
 rm -f $linkfile
diff --git a/tests/generic/397 b/tests/generic/397
index f2e22950..c2245bd5 100755
--- a/tests/generic/397
+++ b/tests/generic/397
@@ -36,6 +36,7 @@ rm -f $seqres.full
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_symlinks
 _require_scratch_encryption
 _require_command "$KEYCTL_PROG" keyctl
 
diff --git a/tests/generic/399 b/tests/generic/399
index a9b3997a..a4013720 100755
--- a/tests/generic/399
+++ b/tests/generic/399
@@ -43,6 +43,7 @@ rm -f $seqres.full
 _supported_fs generic
 _supported_os Linux
 _require_scratch_encryption
+_require_symlinks
 _require_command "$XZ_PROG" xz
 _require_command "$KEYCTL_PROG" keyctl
 
diff --git a/tests/generic/401 b/tests/generic/401
index 9d45fbcd..00e9bbe0 100755
--- a/tests/generic/401
+++ b/tests/generic/401
@@ -37,6 +37,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_symlinks
 _require_test_program "t_dir_type"
 
 rm -f $seqres.full
diff --git a/tests/generic/423 b/tests/generic/423
index b61d5de0..6db55fd6 100755
--- a/tests/generic/423
+++ b/tests/generic/423
@@ -38,6 +38,7 @@ _require_test
 _require_test_program "stat_test"
 _require_test_program "af_unix"
 _require_statx
+_require_symlinks
 
 function check_stat () {
 	$here/src/stat_test $* || echo stat_test failed
diff --git a/tests/generic/440 b/tests/generic/440
index 1ec1ed48..3446c147 100755
--- a/tests/generic/440
+++ b/tests/generic/440
@@ -38,6 +38,7 @@ rm -f $seqres.full
 _supported_fs generic
 _supported_os Linux
 _require_scratch_encryption
+_require_symlinks
 _require_command "$KEYCTL_PROG" keyctl
 
 # Set up an encryption-capable filesystem and an encryption key.
diff --git a/tests/generic/479 b/tests/generic/479
index ad20aaee..aaf864a4 100755
--- a/tests/generic/479
+++ b/tests/generic/479
@@ -32,6 +32,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_symlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/556 b/tests/generic/556
index b7239e34..4899b403 100755
--- a/tests/generic/556
+++ b/tests/generic/556
@@ -19,6 +19,7 @@ _supported_os Linux
 _supported_fs generic
 _require_scratch_nocheck
 _require_scratch_casefold
+_require_symlinks
 _require_check_dmesg
 _require_attrs
 

[PATCH 3/4] fstests: add _require_hardlinks for all necessary tests

[Eric Sandeen]

Add a new _require function for hardlinks, to test hardlink support
in all tests which need it.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

V2: Use full pathname for ln target

diff --git a/common/rc b/common/rc
index 31361d0e..742b99de 100644
--- a/common/rc
+++ b/common/rc
@@ -3493,6 +3493,18 @@ _require_symlinks()
 	rm -f $target $link
 }
 
+_require_hardlinks()
+{
+	local target=`mktemp -p $TEST_DIR`
+	local link=`mktemp -p $TEST_DIR -u`
+	ln $target $link
+	if [ "$?" -ne 0 ]; then
+		rm -f $target
+		_notrun "No hardlink support"
+	fi
+	rm -f $target $link
+}
+
 _require_test_fcntl_advisory_locks()
 {
 	[ "$FSTYP" != "cifs" ] && return 0
diff --git a/tests/generic/002 b/tests/generic/002
index 575ac42b..480b77bc 100755
--- a/tests/generic/002
+++ b/tests/generic/002
@@ -28,6 +28,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_test
+_require_hardlinks
 
 rm -f $seqres.full
 
diff --git a/tests/generic/039 b/tests/generic/039
index daa2e353..27cd6bf5 100755
--- a/tests/generic/039
+++ b/tests/generic/039
@@ -39,6 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/040 b/tests/generic/040
index 712ae595..b69d8127 100755
--- a/tests/generic/040
+++ b/tests/generic/040
@@ -44,6 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/041 b/tests/generic/041
index 8001e8ce..1674d544 100755
--- a/tests/generic/041
+++ b/tests/generic/041
@@ -48,6 +48,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/056 b/tests/generic/056
index 9caf1166..28920d36 100755
--- a/tests/generic/056
+++ b/tests/generic/056
@@ -37,6 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/057 b/tests/generic/057
index ba51dbb9..91e1d98e 100755
--- a/tests/generic/057
+++ b/tests/generic/057
@@ -37,6 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/065 b/tests/generic/065
index d6a1670b..30f3c32e 100755
--- a/tests/generic/065
+++ b/tests/generic/065
@@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/089 b/tests/generic/089
index 3d608269..52649596 100755
--- a/tests/generic/089
+++ b/tests/generic/089
@@ -36,6 +36,7 @@ addentries()
 _supported_fs generic
 _supported_os Linux
 _require_test
+_require_hardlinks
 
 rm -f $seqres.full
 [ "X$TEST_DIR" = "X" ] && exit 1
diff --git a/tests/generic/090 b/tests/generic/090
index bf38d1c8..db1aeef3 100755
--- a/tests/generic/090
+++ b/tests/generic/090
@@ -36,6 +36,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/104 b/tests/generic/104
index d78689f4..4b6256db 100755
--- a/tests/generic/104
+++ b/tests/generic/104
@@ -31,6 +31,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/106 b/tests/generic/106
index 74d5dc30..e1c859e5 100755
--- a/tests/generic/106
+++ b/tests/generic/106
@@ -30,6 +30,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/107 b/tests/generic/107
index 5c6bbfca..214f3389 100755
--- a/tests/generic/107
+++ b/tests/generic/107
@@ -33,6 +33,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/236 b/tests/generic/236
index f207165f..2110b053 100755
--- a/tests/generic/236
+++ b/tests/generic/236
@@ -25,8 +25,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs generic
-# only Linux supports fallocate
 _supported_os Linux
+_require_hardlinks
 _require_test
 
 rm -f $TEST_DIR/ouch*
diff --git a/tests/generic/336 b/tests/generic/336
index e007552c..6832ccde 100755
--- a/tests/generic/336
+++ b/tests/generic/336
@@ -32,6 +32,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/343 b/tests/generic/343
index e35488dd..2034197e 100755
--- a/tests/generic/343
+++ b/tests/generic/343
@@ -32,6 +32,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/378 b/tests/generic/378
index 393d1ce7..ea776949 100755
--- a/tests/generic/378
+++ b/tests/generic/378
@@ -39,6 +39,7 @@ _supported_fs generic
 _supported_os Linux
 _require_test
 _require_user
+_require_hardlinks
 
 # Setup testfile and its hardlink
 testfile=$TEST_DIR/testfile.$seq
diff --git a/tests/generic/480 b/tests/generic/480
index ba2c34ad..63a87519 100755
--- a/tests/generic/480
+++ b/tests/generic/480
@@ -32,6 +32,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/498 b/tests/generic/498
index 71f5091c..7adf0b32 100755
--- a/tests/generic/498
+++ b/tests/generic/498
@@ -31,6 +31,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/502 b/tests/generic/502
index a60ac9a7..a49ee0b3 100755
--- a/tests/generic/502
+++ b/tests/generic/502
@@ -34,6 +34,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/526 b/tests/generic/526
index d0b51f87..934d263f 100755
--- a/tests/generic/526
+++ b/tests/generic/526
@@ -32,6 +32,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full
diff --git a/tests/generic/527 b/tests/generic/527
index 61dd4f0b..4b664da9 100755
--- a/tests/generic/527
+++ b/tests/generic/527
@@ -32,6 +32,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_hardlinks
 _require_dm_target flakey
 
 rm -f $seqres.full

[PATCH 4/4] fstests: test for fallocate capability in more tests

[Eric Sandeen]

These 3 tests explicitly call xfs_io's fallocate command, test whether
it works before running the test.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---

diff --git a/tests/generic/286 b/tests/generic/286
index 00cb87b7..8be4fbc9 100755
--- a/tests/generic/286
+++ b/tests/generic/286
@@ -23,6 +23,7 @@ _supported_fs generic
 _supported_os Linux
 
 _require_test
+_require_xfs_io_command "falloc"
 _require_seek_data_hole
 
 src=$TEST_DIR/seek_copy_testfile
diff --git a/tests/generic/404 b/tests/generic/404
index 14decdb7..69d7e71e 100755
--- a/tests/generic/404
+++ b/tests/generic/404
@@ -76,6 +76,7 @@ rm -f $seqres.full
 _supported_fs generic
 _supported_os Linux
 _require_test
+_require_xfs_io_command "falloc"
 _require_xfs_io_command "finsert"
 
 blksize=`_get_block_size $TEST_DIR`
diff --git a/tests/generic/569 b/tests/generic/569
index 4573be5a..385fa59f 100755
--- a/tests/generic/569
+++ b/tests/generic/569
@@ -29,6 +29,7 @@ _cleanup()
 # real QA test starts here
 _supported_os Linux
 _supported_fs generic
+_require_xfs_io_command "falloc"
 _require_test_program swapon
 _require_scratch_swapfile
 

[PATCH 5/4] fstests: exclude exfat from tests which require metadata journaling

[Eric Sandeen]

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

diff --git a/common/rc b/common/rc
index 476d3d07..ec17c99a 100644
--- a/common/rc
+++ b/common/rc
@@ -3211,7 +3211,7 @@ _has_metadata_journaling()
 	fi
 
 	case "$FSTYP" in
-	ext2|vfat|msdos|udf)
+	ext2|vfat|msdos|udf|exfat)
 		echo "$FSTYP does not support metadata journaling"
 		return 1
 		;;

Re: [PATCH 0/4 V2] fstests: fix test requirements for exfat testing support

[Zorro Lang]

On Wed, Apr 15, 2020 at 03:16:47PM -0500, Eric Sandeen wrote:
> Running xfstests over exfat reveals a lot of tests don't properly check
> for filesystem capabilities before running, which leads to incorrect
> failures.  This series fixes up several of those.

This version looks good to me now. (Although I'm wondering how's the "5/4"
generated :-p )

Reviewed-by: Zorro Lang <zlang@redhat.com>

Thanks,
Zorro

> 
> -Eric
>