[src/trunk]: src Update resize_ffs tests for byteswapped file system support, ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src Update resize_ffs tests for byteswapped file system support, ...
From: riz <riz%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 19:44:31 +0000
details:   https://anonhg.NetBSD.org/src/rev/2c953a4d0034
branches:  trunk
changeset: 760441:2c953a4d0034
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Jan 05 02:25:27 2011 +0000

description:
Update resize_ffs tests for byteswapped file system support, and
for UFS2 growth support.  Also, reduce the number of tests run by default
while still maintaining decent coverage of features and block sizes.
Anyone working on resize_Ffs should run the tests with RESIZE_FFS_ALL_TESTS
set in the environment, which adds a lot more testing.

diffstat:

 distrib/sets/lists/tests/mi               |    5 +-
 tests/sbin/resize_ffs/Makefile            |    4 +-
 tests/sbin/resize_ffs/common.sh           |    5 +-
 tests/sbin/resize_ffs/t_grow.sh           |  125 +++++++++++++++--
 tests/sbin/resize_ffs/t_grow_swapped.sh   |  220 ++++++++++++++++++++++++++++++
 tests/sbin/resize_ffs/t_shrink.sh         |   98 +++++++++++-
 tests/sbin/resize_ffs/t_shrink_swapped.sh |  185 +++++++++++++++++++++++++
 7 files changed, 606 insertions(+), 36 deletions(-)

diffs (truncated from 795 to 300 lines):

diff -r 2c09d2c6ca74 -r 2c953a4d0034 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Wed Jan 05 02:18:15 2011 +0000
+++ b/distrib/sets/lists/tests/mi       Wed Jan 05 02:25:27 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.206 2011/01/04 22:30:41 pgoyette Exp $
+# $NetBSD: mi,v 1.207 2011/01/05 02:25:27 riz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1818,8 +1818,9 @@
 ./usr/tests/sbin/resize_ffs                    tests-sbin-tests
 ./usr/tests/sbin/resize_ffs/Atffile            tests-sbin-tests        atf
 ./usr/tests/sbin/resize_ffs/t_grow             tests-sbin-tests        atf
+./usr/tests/sbin/resize_ffs/t_grow_swapped     tests-sbin-tests        atf
 ./usr/tests/sbin/resize_ffs/t_resize_ffs       tests-obsolete          obsolete
-./usr/tests/sbin/resize_ffs/t_shrink           tests-sbin-tests        atf
+./usr/tests/sbin/resize_ffs/t_shrink_swapped   tests-sbin-tests        atf
 ./usr/tests/sbin/resize_ffs/testdata.md5       tests-sbin-tests        atf
 ./usr/tests/sbin/resize_ffs/testdata.tar.gz.base64     tests-sbin-tests        atf
 ./usr/tests/sys                                tests-sys-tests
diff -r 2c09d2c6ca74 -r 2c953a4d0034 tests/sbin/resize_ffs/Makefile
--- a/tests/sbin/resize_ffs/Makefile    Wed Jan 05 02:18:15 2011 +0000
+++ b/tests/sbin/resize_ffs/Makefile    Wed Jan 05 02:25:27 2011 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/12/09 05:19:02 riz Exp $
+# $NetBSD: Makefile,v 1.3 2011/01/05 02:25:27 riz Exp $
 
 .include <bsd.own.mk>
 
 TESTSDIR=      ${TESTSBASE}/sbin/resize_ffs
 
-.for name in t_grow t_shrink
+.for name in t_grow t_shrink t_grow_swapped t_shrink_swapped
 TESTS_SH+=     ${name}
 TESTS_SH_SRC_${name}=  common.sh ${name}.sh
 .endfor
diff -r 2c09d2c6ca74 -r 2c953a4d0034 tests/sbin/resize_ffs/common.sh
--- a/tests/sbin/resize_ffs/common.sh   Wed Jan 05 02:18:15 2011 +0000
+++ b/tests/sbin/resize_ffs/common.sh   Wed Jan 05 02:25:27 2011 +0000
@@ -100,7 +100,7 @@
 
 resize_ffs()
 {
-       echo "in shrink_ffs:" ${@}
+       echo "in resize_ffs:" ${@}
        local bs=$1
        local fragsz=$2
        local osize=$3
@@ -110,7 +110,7 @@
        local swap=$7
        mkdir -p mnt
        echo "bs is ${bs} numdata is ${numdata}"
-       echo "****shrinking fs with blocksize ${bs}"
+       echo "****resizing fs with blocksize ${bs}"
 
        # we want no more than 16K/inode to allow test files to copy.
        local fpi=$((fragsz * 4))
@@ -147,5 +147,4 @@
            check_data_range $((remove + 1)) ${numdata}
        fi
        umount mnt
-       rm -f ${IMG}    # probably unnecessary
 }
diff -r 2c09d2c6ca74 -r 2c953a4d0034 tests/sbin/resize_ffs/t_grow.sh
--- a/tests/sbin/resize_ffs/t_grow.sh   Wed Jan 05 02:18:15 2011 +0000
+++ b/tests/sbin/resize_ffs/t_grow.sh   Wed Jan 05 02:25:27 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_grow.sh,v 1.6 2010/12/16 17:50:13 riz Exp $
+# $NetBSD: t_grow.sh,v 1.7 2011/01/05 02:25:27 riz Exp $
 #
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -35,10 +35,37 @@
 # determined manually based on the maximum number that will fit in the
 # created fs.  'level' is the fs-level (-O 0,1,2) passed to newfs.
 # If 'swap' is included, byteswap the fs
+
+# v0 == newfs -O0  (4.3BSD layout, ffsv1 superblock)
+test_case grow_16M_v0_4096 resize_ffs 4096 512 32768 131072 0 28
+test_case grow_16M_v0_8192 resize_ffs 8192 1024 32768 131072 0 28
+test_case grow_16M_v0_16384 resize_ffs 16384 2048 32768 131072 0 29
+test_case grow_16M_v0_32768 resize_ffs 32768 4096 32768 131072 0 28
+test_case grow_16M_v0_65536 resize_ffs 65536 8192 32768 131072 0 26
+# these grow_24M grow a smaller amount; sometimes there's different issues
+test_case grow_24M_v0_4096 resize_ffs 4096 512 49152 65536 0 41
+test_case grow_24M_v0_8192 resize_ffs 8192 1024 49152 65536 0 42
+test_case grow_24M_v0_16384 resize_ffs 16384 2048 49152 65536 0 43
+test_case grow_24M_v0_32768 resize_ffs 32768 4096 49152 65536 0 42
+test_case grow_24M_v0_65536 resize_ffs 65536 8192 49152 65536 0 38
+test_case grow_32M_v0_4096 resize_ffs 4096 512 65536 131072 0 55
+test_case grow_32M_v0_8192 resize_ffs 8192 1024 65536 131072 0 56
+test_case grow_32M_v0_16384 resize_ffs 16384 2048 65536 131072 0 58
+test_case grow_32M_v0_32768 resize_ffs 32768 4096 65536 131072 0 56
+test_case grow_32M_v0_65536 resize_ffs 65536 8192 65536 131072 0 51
+test_case grow_48M_v0_4096 resize_ffs 4096 512 98304 131072 0 82
+test_case grow_48M_v0_8192 resize_ffs 8192 1024 98304 131072 0 84
+test_case grow_48M_v0_16384 resize_ffs 16384 2048 98304 131072 0 87
+test_case grow_48M_v0_32768 resize_ffs 32768 4096 98304 131072 0 83
+test_case grow_48M_v0_65536 resize_ffs 65536 8192 98304 131072 0 76
+test_case grow_64M_v0_4096 resize_ffs 4096 512 131072 262144 0 109
+test_case grow_64M_v0_8192 resize_ffs 8192 1024 131072 262144 0 111
+test_case grow_64M_v0_16384 resize_ffs 16384 2048 131072 262144 0 115
+test_case grow_64M_v0_32768 resize_ffs 32768 4096 131072 262144 0 111
+test_case grow_64M_v0_65536 resize_ffs 65536 8192 131072 262144 0 101
+
+# v1 == newfs -O1 (FFSv1, v2 superblock layout)
 test_case grow_16M_v1_4096 resize_ffs 4096 512 32768 131072 1 28
-test_case_xfail grow_16M_v1_4096_swapped "PR bin/44203" resize_ffs 4096 512 32768 131072 1 28 swap
-test_case_xfail grow_16M_v2_4096 "PR bin/44205" resize_ffs 4096 512 32768 131072 2 28
-test_case_xfail grow_16M_v2_4096_swapped "PR bin/44203, PR bin/44205" resize_ffs 4096 512 32768 131072 2 28 swap
 test_case grow_16M_v1_8192 resize_ffs 8192 1024 32768 131072 1 28
 test_case grow_16M_v1_16384 resize_ffs 16384 2048 32768 131072 1 29
 test_case grow_16M_v1_32768 resize_ffs 32768 4096 32768 131072 1 28
@@ -64,9 +91,31 @@
 test_case grow_64M_v1_16384 resize_ffs 16384 2048 131072 262144 1 115
 test_case grow_64M_v1_32768 resize_ffs 32768 4096 131072 262144 1 111
 test_case grow_64M_v1_65536 resize_ffs 65536 8192 131072 262144 1 101
-test_case_xfail grow_64M_v1_65536_swapped "PR bin/44203" resize_ffs 65536 8192 131072 262144 1 101 swap
-test_case_xfail grow_64M_v2_65536 "PR bin/44205" resize_ffs 65536 8192 131072 262144 2 101
-test_case_xfail grow_64M_v2_65536_swapped "PR bin/44203, PR bin/44205" resize_ffs 65536 8192 131072 262144 2 101 swap
+test_case grow_16M_v2_4096 resize_ffs 4096 512 32768 131072 2 26
+test_case grow_16M_v2_8192 resize_ffs 8192 1024 32768 131072 2 28
+test_case grow_16M_v2_16384 resize_ffs 16384 2048 32768 131072 2 29
+test_case grow_16M_v2_32768 resize_ffs 32768 4096 32768 131072 2 28
+test_case grow_16M_v2_65536 resize_ffs 65536 8192 32768 131072 2 25
+test_case grow_24M_v2_4096 resize_ffs 4096 512 49152 65536 2 41
+test_case grow_24M_v2_8192 resize_ffs 8192 1024 49152 65536 2 42
+test_case grow_24M_v2_16384 resize_ffs 16384 2048 49152 65536 2 43
+test_case grow_24M_v2_32768 resize_ffs 32768 4096 49152 65536 2 42
+test_case grow_24M_v2_65536 resize_ffs 65536 8192 49152 65536 2 38
+test_case grow_32M_v2_4096 resize_ffs 4096 512 65536 131072 2 55
+test_case grow_32M_v2_8192 resize_ffs 8192 1024 65536 131072 2 56
+test_case grow_32M_v2_16384 resize_ffs 16384 2048 65536 131072 2 58
+test_case grow_32M_v2_32768 resize_ffs 32768 4096 65536 131072 2 56
+test_case grow_32M_v2_65536 resize_ffs 65536 8192 65536 131072 2 51
+test_case grow_48M_v2_4096 resize_ffs 4096 512 98304 131072 2 82
+test_case grow_48M_v2_8192 resize_ffs 8192 1024 98304 131072 2 84
+test_case grow_48M_v2_16384 resize_ffs 16384 2048 98304 131072 2 87
+test_case grow_48M_v2_32768 resize_ffs 32768 4096 98304 131072 2 83
+test_case grow_48M_v2_65536 resize_ffs 65536 8192 98304 131072 2 76
+test_case grow_64M_v2_4096 resize_ffs 4096 512 131072 262144 2 109
+test_case grow_64M_v2_8192 resize_ffs 8192 1024 131072 262144 2 111
+test_case grow_64M_v2_16384 resize_ffs 16384 2048 131072 262144 2 115
+test_case grow_64M_v2_32768 resize_ffs 32768 4096 131072 262144 2 111
+test_case grow_64M_v2_65536 resize_ffs 65536 8192 131072 262144 2 101
 
 atf_test_case grow_ffsv1_partial_cg
 grow_ffsv1_partial_cg_head()
@@ -82,22 +131,50 @@
        atf_check -o ignore -e ignore newfs -V1 -s 4000 -F ${IMG}
 
        # size to grow to is chosen to cause partial cg
-       atf_check -s exit:0 resize_ffs -y -s 5760 ${IMG}
+       atf_check -s exit:0 -o ignore resize_ffs -y -s 5760 ${IMG}
        atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
 }
 
 atf_init_test_cases()
 {
        setupvars
+       atf_add_test_case grow_16M_v0_8192
+       atf_add_test_case grow_16M_v1_16384
+       atf_add_test_case grow_16M_v2_32768
+if [ "${RESIZE_FFS_ALL_TESTS-X}" != "X" ]; then
+       atf_add_test_case grow_16M_v0_4096
+       atf_add_test_case grow_16M_v0_16384
+       atf_add_test_case grow_16M_v0_32768
+       atf_add_test_case grow_16M_v0_65536
        atf_add_test_case grow_16M_v1_4096
-       atf_add_test_case grow_16M_v1_4096_swapped
-       atf_add_test_case grow_16M_v2_4096
-       atf_add_test_case grow_16M_v2_4096_swapped
        atf_add_test_case grow_16M_v1_8192
-       atf_add_test_case grow_16M_v1_16384
        atf_add_test_case grow_16M_v1_32768
        atf_add_test_case grow_16M_v1_65536
-if [ "${RESIZE_FFS_ALL_TESTS-X}" != "X" ]; then
+       atf_add_test_case grow_16M_v2_4096
+       atf_add_test_case grow_16M_v2_8192
+       atf_add_test_case grow_16M_v2_16384
+       atf_add_test_case grow_16M_v2_65536
+       atf_add_test_case grow_24M_v0_4096
+       atf_add_test_case grow_24M_v0_8192
+       atf_add_test_case grow_24M_v0_16384
+       atf_add_test_case grow_24M_v0_32768
+       atf_add_test_case grow_24M_v0_65536
+       atf_add_test_case grow_32M_v0_4096
+       atf_add_test_case grow_32M_v0_8192
+       atf_add_test_case grow_32M_v0_16384
+       atf_add_test_case grow_32M_v0_32768
+       atf_add_test_case grow_32M_v0_65536
+       atf_add_test_case grow_48M_v0_4096
+       atf_add_test_case grow_48M_v0_8192
+       atf_add_test_case grow_48M_v0_16384
+       atf_add_test_case grow_48M_v0_32768
+       atf_add_test_case grow_48M_v0_65536
+       atf_add_test_case grow_64M_v0_4096
+       atf_add_test_case grow_64M_v0_8192
+       atf_add_test_case grow_64M_v0_16384
+       atf_add_test_case grow_64M_v0_32768
+       atf_add_test_case grow_64M_v0_65536
+
        atf_add_test_case grow_24M_v1_4096
        atf_add_test_case grow_24M_v1_8192
        atf_add_test_case grow_24M_v1_16384
@@ -118,9 +195,27 @@
        atf_add_test_case grow_64M_v1_16384
        atf_add_test_case grow_64M_v1_32768
        atf_add_test_case grow_64M_v1_65536
-       atf_add_test_case grow_64M_v1_65536_swapped
+
+       atf_add_test_case grow_24M_v2_4096
+       atf_add_test_case grow_24M_v2_8192
+       atf_add_test_case grow_24M_v2_16384
+       atf_add_test_case grow_24M_v2_32768
+       atf_add_test_case grow_24M_v2_65536
+       atf_add_test_case grow_32M_v2_4096
+       atf_add_test_case grow_32M_v2_8192
+       atf_add_test_case grow_32M_v2_16384
+       atf_add_test_case grow_32M_v2_32768
+       atf_add_test_case grow_32M_v2_65536
+       atf_add_test_case grow_48M_v2_4096
+       atf_add_test_case grow_48M_v2_8192
+       atf_add_test_case grow_48M_v2_16384
+       atf_add_test_case grow_48M_v2_32768
+       atf_add_test_case grow_48M_v2_65536
+       atf_add_test_case grow_64M_v2_4096
+       atf_add_test_case grow_64M_v2_8192
+       atf_add_test_case grow_64M_v2_16384
+       atf_add_test_case grow_64M_v2_32768
        atf_add_test_case grow_64M_v2_65536
-       atf_add_test_case grow_64M_v2_65536_swapped
 fi
        atf_add_test_case grow_ffsv1_partial_cg
 }
diff -r 2c09d2c6ca74 -r 2c953a4d0034 tests/sbin/resize_ffs/t_grow_swapped.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sbin/resize_ffs/t_grow_swapped.sh   Wed Jan 05 02:25:27 2011 +0000
@@ -0,0 +1,220 @@
+# $NetBSD: t_grow_swapped.sh,v 1.1 2011/01/05 02:25:27 riz Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jeffrey C. Rizzo.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+# resize_ffs params as follows:
+# resize_ffs blocksize fragsize fssize newfssize level numdata swap
+# where 'numdata' is the number of data directories to copy - this is
+# determined manually based on the maximum number that will fit in the
+# created fs.  'level' is the fs-level (-O 0,1,2) passed to newfs.
+# If 'swap' is included, byteswap the fs
+
+# v0 == newfs -O0  (4.3BSD layout, ffsv1 superblock)
+test_case grow_16M_v0_4096 resize_ffs 4096 512 32768 131072 0 28 swap
+test_case grow_16M_v0_8192 resize_ffs 8192 1024 32768 131072 0 28 swap
+test_case grow_16M_v0_16384 resize_ffs 16384 2048 32768 131072 0 29 swap
+test_case grow_16M_v0_32768 resize_ffs 32768 4096 32768 131072 0 28 swap
+test_case grow_16M_v0_65536 resize_ffs 65536 8192 32768 131072 0 26 swap
+# these grow_24M grow a smaller amount; sometimes there's different issues
+test_case grow_24M_v0_4096 resize_ffs 4096 512 49152 65536 0 41 swap
+test_case grow_24M_v0_8192 resize_ffs 8192 1024 49152 65536 0 42 swap
+test_case grow_24M_v0_16384 resize_ffs 16384 2048 49152 65536 0 43 swap
+test_case grow_24M_v0_32768 resize_ffs 32768 4096 49152 65536 0 42 swap
+test_case grow_24M_v0_65536 resize_ffs 65536 8192 49152 65536 0 38 swap
+test_case grow_32M_v0_4096 resize_ffs 4096 512 65536 131072 0 55 swap
+test_case grow_32M_v0_8192 resize_ffs 8192 1024 65536 131072 0 56 swap
+test_case grow_32M_v0_16384 resize_ffs 16384 2048 65536 131072 0 58 swap
+test_case grow_32M_v0_32768 resize_ffs 32768 4096 65536 131072 0 56 swap
+test_case grow_32M_v0_65536 resize_ffs 65536 8192 65536 131072 0 51 swap
+test_case grow_48M_v0_4096 resize_ffs 4096 512 98304 131072 0 82 swap
+test_case grow_48M_v0_8192 resize_ffs 8192 1024 98304 131072 0 84 swap
+test_case grow_48M_v0_16384 resize_ffs 16384 2048 98304 131072 0 87 swap
+test_case grow_48M_v0_32768 resize_ffs 32768 4096 98304 131072 0 83 swap
+test_case grow_48M_v0_65536 resize_ffs 65536 8192 98304 131072 0 76 swap
+test_case grow_64M_v0_4096 resize_ffs 4096 512 131072 262144 0 109 swap
Prev by Date: [src/trunk]: src/sys/arch/hp700/include Unwrap short line.
Next by Date: [src/trunk]: src/sys/dev/acpi Make a two-pass scan for acpinodebus. This shou...
Previous by Thread: [src/trunk]: src/sys/arch/hp700/include Unwrap short line.
Next by Thread: [src/trunk]: src/sys/dev/acpi Make a two-pass scan for acpinodebus. This shou...
Indexes:
Home | Main Index | Thread Index | Old Index