xfs/512: split out v4 specific tests

Split the v4-specific tests into a new xfs/613.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/xfs/513 b/tests/xfs/513
index ce2bb34916c90f73da066703d469b93d9920fa55..3a85ed429ba17ceeafee44fc0518949ebbce2fdc 100755 (executable)
--- a/tests/xfs/513
+++ b/tests/xfs/513
@@ -193,10 +193,6 @@ do_mkfs -m crc=1
 do_test "" pass "attr2" "true"
 do_test "-o attr2" pass "attr2" "true"
 do_test "-o noattr2" fail
-do_mkfs -m crc=0
-do_test "" pass "attr2" "true"
-do_test "-o attr2" pass "attr2" "true"
-do_test "-o noattr2" pass "attr2" "false"
 
 # Test discard
 do_mkfs
@@ -255,15 +251,6 @@ do_test "-o logbsize=128k" pass "logbsize=128k" "true"
 do_test "-o logbsize=256k" pass "logbsize=256k" "true"
 do_test "-o logbsize=8k" fail
 do_test "-o logbsize=512k" fail
-do_mkfs -m crc=0 -l version=1
-# New kernel (refer to 4f62282a3696 xfs: cleanup xlog_get_iclog_buffer_size)
-# prints "logbsize=N" in /proc/mounts, but old kernel not. So the default
-# 'display' about logbsize can't be expected, disable this test.
-#do_test "" pass "logbsize" "false"
-do_test "-o logbsize=16384" pass "logbsize=16k" "true"
-do_test "-o logbsize=16k" pass "logbsize=16k" "true"
-do_test "-o logbsize=32k" pass "logbsize=32k" "true"
-do_test "-o logbsize=64k" fail
 
 # Test logdev
 do_mkfs

diff --git a/tests/xfs/513.out b/tests/xfs/513.out
index eec8155d7bf348a74241c59caa0aff172d184b91..39945907140b37f99d61709950f4d48c38f7d854 100644 (file)
--- a/tests/xfs/513.out
+++ b/tests/xfs/513.out
@@ -13,10 +13,6 @@ FORMAT: -m crc=1
 TEST: "" "pass" "attr2" "true"
 TEST: "-o attr2" "pass" "attr2" "true"
 TEST: "-o noattr2" "fail"
-FORMAT: -m crc=0
-TEST: "" "pass" "attr2" "true"
-TEST: "-o attr2" "pass" "attr2" "true"
-TEST: "-o noattr2" "pass" "attr2" "false"
 FORMAT: 
 TEST: "" "pass" "discard" "false"
 TEST: "-o discard" "pass" "discard" "true"
@@ -51,11 +47,6 @@ TEST: "-o logbsize=128k" "pass" "logbsize=128k" "true"
 TEST: "-o logbsize=256k" "pass" "logbsize=256k" "true"
 TEST: "-o logbsize=8k" "fail"
 TEST: "-o logbsize=512k" "fail"
-FORMAT: -m crc=0 -l version=1
-TEST: "-o logbsize=16384" "pass" "logbsize=16k" "true"
-TEST: "-o logbsize=16k" "pass" "logbsize=16k" "true"
-TEST: "-o logbsize=32k" "pass" "logbsize=32k" "true"
-TEST: "-o logbsize=64k" "fail"
 FORMAT: 
 TEST: "" "pass" "logdev" "false"
 TEST: "-o logdev=LOOP_SPARE_DEV" "fail"

diff --git a/tests/xfs/613 b/tests/xfs/613
new file mode 100755 (executable)
index 0000000..522358c
--- /dev/null
+++ b/tests/xfs/613
@@ -0,0 +1,198 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2019 Red Hat, Inc. All Rights Reserved.
+#
+# FS QA Test No. 613
+#
+# XFS v4 mount options sanity check, refer to 'man 5 xfs'.
+#
+. ./common/preamble
+_begin_fstest auto mount prealloc
+
+# Override the default cleanup function.
+_cleanup()
+{
+       cd /
+       rm -f $tmp.*
+       $UMOUNT_PROG $LOOP_MNT 2>/dev/null
+       if [ -n "$LOOP_DEV" ];then
+               _destroy_loop_device $LOOP_DEV 2>/dev/null
+       fi
+       if [ -n "$LOOP_SPARE_DEV" ];then
+               _destroy_loop_device $LOOP_SPARE_DEV 2>/dev/null
+       fi
+       rm -f $LOOP_IMG
+       rm -f $LOOP_SPARE_IMG
+       rmdir $LOOP_MNT
+}
+
+# Import common functions.
+. ./common/filter
+
+# real QA test starts here
+_supported_fs xfs
+_fixed_by_kernel_commit 237d7887ae72 \
+       "xfs: show the proper user quota options"
+
+_require_test
+_require_loop
+_require_xfs_io_command "falloc"
+
+LOOP_IMG=$TEST_DIR/$seq.dev
+LOOP_SPARE_IMG=$TEST_DIR/$seq.logdev
+LOOP_MNT=$TEST_DIR/$seq.mnt
+
+echo "** create loop device"
+$XFS_IO_PROG -f -c "truncate 32g" $LOOP_IMG
+LOOP_DEV=`_create_loop_device $LOOP_IMG`
+
+echo "** create loop log device"
+$XFS_IO_PROG -f -c "truncate 1g" $LOOP_SPARE_IMG
+LOOP_SPARE_DEV=`_create_loop_device $LOOP_SPARE_IMG`
+
+echo "** create loop mount point"
+rmdir $LOOP_MNT 2>/dev/null
+mkdir -p $LOOP_MNT || _fail "cannot create loopback mount point"
+
+filter_loop()
+{
+       sed -e "s,\B$LOOP_MNT,LOOP_MNT,g" \
+           -e "s,\B$LOOP_DEV,LOOP_DEV,g" \
+           -e "s,\B$LOOP_SPARE_DEV,LOOP_SPARE_DEV,g"
+}
+
+filter_xfs_opt()
+{
+       sed -e "s,allocsize=$pagesz,allocsize=PAGESIZE,g"
+}
+
+# avoid the effection from MKFS_OPTIONS
+MKFS_OPTIONS=""
+do_mkfs()
+{
+       echo "FORMAT: $@" | filter_loop | tee -a $seqres.full
+       $MKFS_XFS_PROG -f $* $LOOP_DEV | _filter_mkfs >>$seqres.full 2>$tmp.mkfs
+       if [ "${PIPESTATUS[0]}" -ne 0 ]; then
+               _fail "Fails on _mkfs_dev $* $LOOP_DEV"
+       fi
+       . $tmp.mkfs
+}
+
+is_dev_mounted()
+{
+       findmnt --source $LOOP_DEV >/dev/null
+       return $?
+}
+
+get_mount_info()
+{
+       findmnt --source $LOOP_DEV -o OPTIONS -n
+}
+
+force_unmount()
+{
+       $UMOUNT_PROG $LOOP_MNT >/dev/null 2>&1
+}
+
+# _do_test <mount options> <should be mounted?> [<key string> <key should be found?>]
+_do_test()
+{
+       local opts="$1"
+       local mounted="$2"      # pass or fail
+       local key="$3"
+       local found="$4"        # true or false
+       local rc
+       local info
+
+       # mount test
+       _mount $LOOP_DEV $LOOP_MNT $opts 2>>$seqres.full
+       rc=$?
+       if [ $rc -eq 0 ];then
+               if [ "${mounted}" = "fail" ];then
+                       echo "[FAILED]: mount $LOOP_DEV $LOOP_MNT $opts"
+                       echo "ERROR: expect mount to fail, but it succeeded"
+                       return 1
+               fi
+               is_dev_mounted
+               if [ $? -ne 0 ];then
+                       echo "[FAILED]: mount $LOOP_DEV $LOOP_MNT $opts"
+                       echo "ERROR: fs not mounted even mount return 0"
+                       return 1
+               fi
+       else
+               if [ "${mounted}" = "pass" ];then
+                       echo "[FAILED]: mount $LOOP_DEV $LOOP_MNT $opts"
+                       echo "ERROR: expect mount to succeed, but it failed"
+                       return 1
+               fi
+               is_dev_mounted
+               if [ $? -eq 0 ];then
+                       echo "[FAILED]: mount $LOOP_DEV $LOOP_MNT $opts"
+                       echo "ERROR: fs is mounted even mount return non-zero"
+                       return 1
+               fi
+       fi
+
+       # Skip below checking if "$key" argument isn't specified
+       if [ -z "$key" ];then
+               return 0
+       fi
+       # Check the mount options after fs mounted.
+       info=`get_mount_info`
+       echo ${info} | grep -q "${key}"
+       rc=$?
+       if [ $rc -eq 0 ];then
+               if [ "$found" != "true" ];then
+                       echo "[FAILED]: mount $LOOP_DEV $LOOP_MNT $opts"
+                       echo "ERROR: expected to find \"$key\" in mount info \"$info\""
+                       return 1
+               fi
+       else
+               if [ "$found" != "false" ];then
+                       echo "[FAILED]: mount $LOOP_DEV $LOOP_MNT $opts"
+                       echo "ERROR: did not expect to find \"$key\" in \"$info\""
+                       return 1
+               fi
+       fi
+
+       return 0
+}
+
+do_test()
+{
+       # Print each argument, include nil ones
+       echo -n "TEST:" | tee -a $seqres.full
+       for i in "$@";do
+               echo -n " \"$i\"" | filter_loop | filter_xfs_opt | tee -a $seqres.full
+       done
+       echo | tee -a $seqres.full
+
+       # force unmount before testing
+       force_unmount
+       _do_test "$@"
+       # force unmount after testing
+       force_unmount
+}
+
+echo "** start xfs mount testing ..."
+# Test attr2
+do_mkfs -m crc=0
+do_test "" pass "attr2" "true"
+do_test "-o attr2" pass "attr2" "true"
+do_test "-o noattr2" pass "attr2" "false"
+
+# Test logbsize=value.
+do_mkfs -m crc=0 -l version=1
+# New kernel (refer to 4f62282a3696 xfs: cleanup xlog_get_iclog_buffer_size)
+# prints "logbsize=N" in /proc/mounts, but old kernel not. So the default
+# 'display' about logbsize can't be expected, disable this test.
+#do_test "" pass "logbsize" "false"
+do_test "-o logbsize=16384" pass "logbsize=16k" "true"
+do_test "-o logbsize=16k" pass "logbsize=16k" "true"
+do_test "-o logbsize=32k" pass "logbsize=32k" "true"
+do_test "-o logbsize=64k" fail
+
+echo "** end of testing"
+# success, all done
+status=0
+exit

diff --git a/tests/xfs/613.out b/tests/xfs/613.out
new file mode 100644 (file)
index 0000000..1624617
--- /dev/null
+++ b/tests/xfs/613.out
@@ -0,0 +1,15 @@
+QA output created by 613
+** create loop device
+** create loop log device
+** create loop mount point
+** start xfs mount testing ...
+FORMAT: -m crc=0
+TEST: "" "pass" "attr2" "true"
+TEST: "-o attr2" "pass" "attr2" "true"
+TEST: "-o noattr2" "pass" "attr2" "false"
+FORMAT: -m crc=0 -l version=1
+TEST: "-o logbsize=16384" "pass" "logbsize=16k" "true"
+TEST: "-o logbsize=16k" "pass" "logbsize=16k" "true"
+TEST: "-o logbsize=32k" "pass" "logbsize=32k" "true"
+TEST: "-o logbsize=64k" "fail"
+** end of testing