[src/trunk]: src/tests/sbin/resize_ffs Wrap the bigger tests in RESIZE_FFS_BI...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e78042b42b85
branches:  trunk
changeset: 759442:e78042b42b85
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Dec 09 17:28:05 2010 +0000

description:
Wrap the bigger tests in RESIZE_FFS_BIG_TESTS, as the automated test
run seems to choke over a certain size.  (This will speed up the runs
as well)

diffstat:

 tests/sbin/resize_ffs/t_grow.sh   |  12 ++++++++++--
 tests/sbin/resize_ffs/t_shrink.sh |  12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diffs (106 lines):

diff -r 538d50a9778d -r e78042b42b85 tests/sbin/resize_ffs/t_grow.sh
--- a/tests/sbin/resize_ffs/t_grow.sh   Thu Dec 09 16:59:35 2010 +0000
+++ b/tests/sbin/resize_ffs/t_grow.sh   Thu Dec 09 17:28:05 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_grow.sh,v 1.1 2010/12/09 05:19:02 riz Exp $
+# $NetBSD: t_grow.sh,v 1.2 2010/12/09 17:28:05 riz Exp $
 #
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -76,6 +76,9 @@
 # created fs.  'level' is the fs-level (-O 0,1,2) passed to newfs.
 # If 'swap' is included, byteswap the fs
 test_case grow_16M_v1_4096 grow_ffs 4096 512 32768 131072 1 28
+test_case_xfail grow_16M_v1_4096_swapped "PR bin/44203" grow_ffs 4096 512 32768 131072 1 28 swap
+test_case_xfail grow_16M_v2_4096 "PR bin/44205" grow_ffs 4096 512 32768 131072 2 28
+test_case_xfail grow_16M_v2_4096_swapped "PR bin/44203, PR bin/44205" grow_ffs 4096 512 32768 131072 2 28 swap
 test_case grow_16M_v1_8192 grow_ffs 8192 1024 32768 131072 1 28
 test_case grow_16M_v1_16384 grow_ffs 16384 2048 32768 131072 1 29
 test_case grow_16M_v1_32768 grow_ffs 32768 4096 32768 131072 1 28
@@ -103,7 +106,7 @@
 test_case grow_64M_v1_65536 grow_ffs 65536 8192 131072 262144 1 101
 test_case_xfail grow_64M_v1_65536_swapped "PR bin/44203" grow_ffs 65536 8192 131072 262144 1 101 swap
 test_case_xfail grow_64M_v2_65536 "PR bin/44205" grow_ffs 65536 8192 131072 262144 2 101
-test_case_xfail grow_64M_v2_65536_swapped "PR bin/44203; PR bin/44205" grow_ffs 65536 8192 131072 262144 2 101 swap
+test_case_xfail grow_64M_v2_65536_swapped "PR bin/44203, PR bin/44205" grow_ffs 65536 8192 131072 262144 2 101 swap
 
 atf_test_case grow_ffsv1_partial_cg
 grow_ffsv1_partial_cg_head()
@@ -127,6 +130,9 @@
 {
        setupvars
        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
@@ -141,6 +147,7 @@
        atf_add_test_case grow_32M_v1_16384
        atf_add_test_case grow_32M_v1_32768
        atf_add_test_case grow_32M_v1_65536
+if [ "X${RESIZE_FFS_BIG_TESTS}" != "X" ]; then
        atf_add_test_case grow_48M_v1_4096
        atf_add_test_case grow_48M_v1_8192
        atf_add_test_case grow_48M_v1_16384
@@ -154,5 +161,6 @@
        atf_add_test_case grow_64M_v1_65536_swapped
        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 538d50a9778d -r e78042b42b85 tests/sbin/resize_ffs/t_shrink.sh
--- a/tests/sbin/resize_ffs/t_shrink.sh Thu Dec 09 16:59:35 2010 +0000
+++ b/tests/sbin/resize_ffs/t_shrink.sh Thu Dec 09 17:28:05 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_shrink.sh,v 1.1 2010/12/09 05:19:02 riz Exp $
+# $NetBSD: t_shrink.sh,v 1.2 2010/12/09 17:28:05 riz Exp $
 #
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -82,6 +82,9 @@
 # created fs.  'level' is the fs-level (-O 0,1,2) passed to newfs.
 # If 'swap' is included, byteswap the fs
 test_case shrink_24M_16M_v1_4096 shrink_ffs 4096 512 49152 32768 1 41
+test_case_xfail shrink_24M_16M_v1_4096_swapped "PR bin/44203" shrink_ffs 4096 512 49152 32768 1 41 swap
+test_case_xfail shrink_24M_16M_v2_4096 "PR bin/44205" shrink_ffs 4096 512 49152 32768 2 41 swap
+test_case_xfail shrink_24M_16M_v2_4096_swapped "PR bin/44203, PR bin/44205" shrink_ffs 4096 512 49152 32768 2 41 swap
 test_case shrink_24M_16M_v1_8192 shrink_ffs 8192 1024 49152 32768 1 42
 test_case shrink_24M_16M_v1_16384 shrink_ffs 16384 2048 49152 32768 1 43
 test_case shrink_24M_16M_v1_32768 shrink_ffs 32768 4096 49152 32768 1 42
@@ -104,7 +107,7 @@
 test_case shrink_64M_48M_v1_65536 shrink_ffs 65536 8192 131072 98304 1 101
 test_case_xfail shrink_64M_48M_v1_65536_swapped "PR bin/44203" shrink_ffs 65536 8192 131072 98304 1 101 swap
 test_case_xfail shrink_64M_48M_v2_65536 "PR bin/44205" shrink_ffs 65536 8192 131072 98304 2 101
-test_case_xfail shrink_64M_48M_v2_65536_swapped "PR bin/44203; PR bin/44205" shrink_ffs 65536 8192 131072 98304 2 101 swap
+test_case_xfail shrink_64M_48M_v2_65536_swapped "PR bin/44203, PR bin/44205" shrink_ffs 65536 8192 131072 98304 2 101 swap
 
 atf_test_case shrink_ffsv1_partial_cg
 shrink_ffsv1_partial_cg_head()
@@ -127,6 +130,9 @@
 {
        setupvars
        atf_add_test_case shrink_24M_16M_v1_4096
+       atf_add_test_case shrink_24M_16M_v1_4096_swapped
+       atf_add_test_case shrink_24M_16M_v2_4096
+       atf_add_test_case shrink_24M_16M_v2_4096_swapped
        atf_add_test_case shrink_24M_16M_v1_8192
        atf_add_test_case shrink_24M_16M_v1_16384
        atf_add_test_case shrink_24M_16M_v1_32768
@@ -136,6 +142,7 @@
        atf_add_test_case shrink_32M_24M_v1_16384
        atf_add_test_case shrink_32M_24M_v1_32768
        atf_add_test_case shrink_32M_24M_v1_65536
+if [ "X${RESIZE_FFS_BIG_TESTS}" != "X" ]; then
        atf_add_test_case shrink_48M_16M_v1_4096
        atf_add_test_case shrink_48M_16M_v1_8192
        atf_add_test_case shrink_48M_16M_v1_16384
@@ -149,5 +156,6 @@
        atf_add_test_case shrink_64M_48M_v1_65536_swapped
        atf_add_test_case shrink_64M_48M_v2_65536
        atf_add_test_case shrink_64M_48M_v2_65536_swapped
+fi
        atf_add_test_case shrink_ffsv1_partial_cg
 }