Some tests require that there's no certain mount option in
MKFS_OPTIONS, so introduce a new helper _exclude_mount_option() to
do the check on $MOUNT_OPTIONS.
Also convert generic/192 and xfs/134 to use this helper.
Signed-off-by: Eryu Guan <eguan@xxxxxxxxxx>
---
v3:
- rename to _exclude_mount_option
- add comment to make it clear that it only works on MOUNT_OPTIONS
v2:
- rebase on top of current master
common/rc | 9 +++++++++
tests/generic/192 | 11 -----------
tests/xfs/134 | 8 +++-----
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/common/rc b/common/rc
index 3a9c4d1..3e7d997 100644
--- a/common/rc
+++ b/common/rc
@@ -2926,8 +2926,17 @@ _require_cloner()
_notrun "cloner binary not present at $CLONER_PROG"
}
+# skip test if MKFS_OPTIONS contains the given string
+_exclude_mount_option()
+{
+ if echo $MOUNT_OPTIONS | grep -q "$1"; then
+ _notrun "mount option \"$1\" not allowed in this test"
+ fi
+}
+
_require_atime()
{
+ _exclude_mount_option "noatime"
if [ "$FSTYP" == "nfs" ]; then
_notrun "atime related mount options have no effect on NFS"
fi
diff --git a/tests/generic/192 b/tests/generic/192
index 6bbc87c..d3ed0ec 100755
--- a/tests/generic/192
+++ b/tests/generic/192
@@ -38,13 +38,6 @@ _access_time()
stat -c %X $1
}
-is_noatime_set() {
- case "$MOUNT_OPTIONS" in
- *noatime*) return 0;;
- esac
- return 1
-}
-
# get standard environment, filters and checks
. ./common/rc
. ./common/filter
@@ -61,10 +54,6 @@ _require_atime
#delay=45
delay=40
-if is_noatime_set; then
- _notrun "this test makes no sense with noatime"
-fi
-
testfile=$TEST_DIR/testfile
rm -f $testfile
rm -f $seqres.full
diff --git a/tests/xfs/134 b/tests/xfs/134
index cd47069..8b03ea3 100755
--- a/tests/xfs/134
+++ b/tests/xfs/134
@@ -50,6 +50,9 @@ _supported_os Linux IRIX
_require_test
_require_xfs_quota
+# we can't run with group quotas
+_exclude_mount_option "gquota"
+_exclude_mount_option "grpquota"
dir=$SCRATCH_MNT/project
@@ -70,11 +73,6 @@ _scratch_mkfs_xfs >/dev/null 2>&1
#if pquota's already in mount options then we dont need to enable
-# we can't run with group quotas
-if ( `echo $MOUNT_OPTIONS | grep -q gquota` || `echo $MOUNT_OPTIONS | grep -q grpquota` )
-then
- _notrun "Can't run with group quotas enabled"
-fi
EXTRA_MOUNT_OPTIONS="-o pquota"
if ! _scratch_mount "$EXTRA_MOUNT_OPTIONS" >$tmp.out 2>&1
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
