From 6565b7986e8c26c796e07148fc0e7e63023a54d7 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 19 Sep 2012 17:53:56 -0500 Subject: [PATCH] xfstests: add _require_freeze and minor cleanups More filesystems have grown freeze capability, so rather than hardcoding several in _supported_fs, make tests 068 and 280 generic and then add a new _require_freeze() which checks whether the fs under test can be frozen before beginning the test. Minor other cleanups to 280: - remove extra _supported_fs line - clear $seq.full before beginning Signed-off-by: Eric Sandeen Reviewed-by: Ben Myers Signed-off-by: Ben Myers --- 068 | 3 ++- 280 | 6 ++++-- common.rc | 9 +++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/068 b/068 index b595d1df..617420cf 100755 --- a/068 +++ b/068 @@ -51,10 +51,11 @@ trap "_cleanup" 0 1 2 3 15 . ./common.filter # real QA test starts here -_supported_fs btrfs ext3 ext4 xfs +_supported_fs generic _supported_os Linux IRIX _require_scratch +_require_freeze echo "*** init FS" diff --git a/280 b/280 index 55849ed1..5e261733 100755 --- a/280 +++ b/280 @@ -45,13 +45,15 @@ _cleanup() _require_scratch _require_quota +_require_freeze # real QA test starts here # Modify as appropriate. -_supported_fs generic _supported_os Linux -_supported_fs ext3 ext4 xfs +_supported_fs generic + +rm -f $seq.full umount $SCRATCH_DEV 2>/dev/null _scratch_mkfs >> $seq.full 2>&1 diff --git a/common.rc b/common.rc index 602513af..e7037c17 100644 --- a/common.rc +++ b/common.rc @@ -1758,6 +1758,15 @@ _require_btrfs() [ $? -eq 0 ] || _notrun "$BTRFS_UTIL_PROG too old (must support $cmd)" } +# Does freeze work on this fs? +_require_freeze() +{ + xfs_freeze -f "$TEST_DIR" >/dev/null 2>&1 + result=$? + xfs_freeze -u "$TEST_DIR" >/dev/null 2>&1 + [ $result -eq 0 ] || _notrun "$FSTYP does not support freezing" +} + # arg 1 is dev to remove and is output of the below eg. # ls -l /sys/class/block/sdd | rev | cut -d "/" -f 3 | rev _devmgt_remove() -- 2.39.5