common: Check fs consistency on TEST_DEV only when needed

Currently we're checking file system consistency on TEST_DEV after every
successful test run even though the TEST_DEV might not even be used in
that test.

Fix it by introducing _require_test to for the test ti indicate that
it's about to use TEST_DEV.

Also add _require_test to the new script so that this requirement is a
default.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/check b/check
index 5b76fabd6cab54bfb1b4714725b921c64ef36800..77c6559123a7ad7d5cca5a7ebbd593c233c96b92 100755 (executable)
--- a/check
+++ b/check
@@ -625,7 +625,8 @@ for section in $HOST_OPTIONS_SECTIONS; do
            then
                try="$try $seqnum"
                n_try=`expr $n_try + 1`
-               _check_test_fs
+               test -f ${RESULT_DIR}/require_test && _check_test_fs
+               rm -f ${RESULT_DIR}/require_test
                test -f ${RESULT_DIR}/require_scratch && _check_scratch_fs
                rm -f ${RESULT_DIR}/require_scratch
            fi

diff --git a/common/rc b/common/rc
index be3d3ca0a68895768a05ccc93368a25887a448e5..ce57b69ee24f5a8a01fd44740d5d7787f6293496 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -989,6 +989,55 @@ _require_scratch()
     touch ${RESULT_DIR}/require_scratch
 }
 
+# this test needs a test partition - check we're ok & unmount it
+#
+_require_test()
+{
+    case "$FSTYP" in
+       nfs*)
+                 _notrun "requires a test device"
+                ;;
+       tmpfs)
+               if [ -z "$TEST_DEV" -o ! -d "$TEST_DIR" ];
+               then
+                   _notrun "this test requires a valid \$TEST_DIR and unique $TEST_DEV"
+               fi
+               ;;
+       *)
+                if [ -z "$TEST_DEV" -o "`_is_block_dev $TEST_DEV`" = "" ]
+                then
+                    _notrun "this test requires a valid \$TEST_DEV"
+                fi
+                if [ "`_is_block_dev $SCRATCH_DEV`" = "`_is_block_dev $TEST_DEV`" ]
+                then
+                    _notrun "this test requires a valid \$TEST_DEV"
+                fi
+               if [ ! -d "$TEST_DIR" ]
+               then
+                    _notrun "this test requires a valid \$TEST_DIR"
+               fi
+                ;;
+    esac
+
+    # mounted?
+    if _mount | grep -q $TEST_DEV
+    then
+        # if it's mounted, make sure its on $TEST_DIR
+        if ! _mount | grep $TEST_DEV | grep -q $TEST_DIR
+        then
+            echo "\$TEST_DEV is mounted but not on \$TEST_DIR - aborting"
+            exit 1
+        fi
+    else
+       out=`_mount_or_remount_rw "$MOUNT_OPTIONS" $TEST_DEV $TEST_DIR`
+       if [ $? -ne 1 ]; then
+               echo $out
+               exit 1
+       fi
+    fi
+    touch ${RESULT_DIR}/require_test
+}
+
 # this test needs a logdev
 #
 _require_logdev()

diff --git a/new b/new
index f712892bcbca498257cf6e7b4f96f523f78e25b6..f3e6fa1fb594c54f0dd080e7c312a814bc195290 100755 (executable)
--- a/new
+++ b/new
@@ -129,6 +129,7 @@ _cleanup()
 # Modify as appropriate.
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 # if error
 exit

diff --git a/tests/btrfs/008 b/tests/btrfs/008
index 9fa36a613667f00d585d5654ecb542f40ec188de..019af0415d182086efcdd7917aa7ca3ad3d6a436 100755 (executable)
--- a/tests/btrfs/008
+++ b/tests/btrfs/008
@@ -50,6 +50,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs btrfs
 _supported_os Linux
+_require_test
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1

diff --git a/tests/btrfs/016 b/tests/btrfs/016
index d04c21ad3837cfc3bd92ef0685214874b3402c73..c8fc70892394995f45ebe41e83509774eae4fda3 100755 (executable)
--- a/tests/btrfs/016
+++ b/tests/btrfs/016
@@ -49,6 +49,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs btrfs
 _supported_os Linux
+_require_test
 _require_scratch
 _require_fssum
 

diff --git a/tests/btrfs/019 b/tests/btrfs/019
index 45bba5ef98a3bbfec4214e77d57b8127d673f341..452d24b809d71efafb16b9eb2320cf1052b471dc 100755 (executable)
--- a/tests/btrfs/019
+++ b/tests/btrfs/019
@@ -50,6 +50,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs btrfs
 _supported_os Linux
+_require_test
 _require_scratch
 
 _scratch_mkfs > /dev/null 2>&1

diff --git a/tests/btrfs/020 b/tests/btrfs/020
index 7464bd031dc5fb66357c0d5f7d1d47295035025d..5a928dde2ac120742e77bb0b866542f82b160efc 100755 (executable)
--- a/tests/btrfs/020
+++ b/tests/btrfs/020
@@ -55,6 +55,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs btrfs
 _supported_os Linux
+_require_test
 
 rm -f $seqres.full
 echo "Silence is golden"

diff --git a/tests/btrfs/026 b/tests/btrfs/026
index c2ac561760e04d1f724b1ab690b4351889d0b30b..7559ca270258491df81c99f7b98738eb5ef7d930 100644 (file)
--- a/tests/btrfs/026
+++ b/tests/btrfs/026
@@ -50,6 +50,7 @@ _supported_os Linux
 
 _require_xfs_io_command "fiemap"
 _require_cp_reflink
+_require_test
 
 TESTDIR1=$TEST_DIR/test-$seq
 rm -rf $TESTDIR1

diff --git a/tests/btrfs/027 b/tests/btrfs/027
index d615efd355c8fef95e62aab196a47e1e54886150..d2b812bb10660eade018a0eac53385d53b1af660 100644 (file)
--- a/tests/btrfs/027
+++ b/tests/btrfs/027
@@ -50,6 +50,7 @@ _supported_os Linux
 
 _require_xfs_io_command "fiemap"
 _require_cp_reflink
+_require_test
 
 TESTDIR1=$TEST_DIR/test-$seq
 rm -rf $TESTDIR1

diff --git a/tests/btrfs/028 b/tests/btrfs/028
index 50cffd35a5008b8670f190ed748616cd154afb05..7193337cc14d3c8c524bc5a3abc6ea6475b4e59a 100644 (file)
--- a/tests/btrfs/028
+++ b/tests/btrfs/028
@@ -48,6 +48,7 @@ _supported_os Linux
 
 _require_xfs_io_command "fiemap"
 _require_cp_reflink
+_require_test
 
 rm -f $seqres.full
 

diff --git a/tests/btrfs/029 b/tests/btrfs/029
index 80c05e31b757e880826483529ffa0b7b25d5f036..0b77b33622fac3fb37bf78b9893ec42c8a131405 100644 (file)
--- a/tests/btrfs/029
+++ b/tests/btrfs/029
@@ -52,6 +52,7 @@ _cleanup()
 _supported_fs btrfs
 _supported_os Linux
 
+_require_test
 _require_scratch
 _require_cp_reflink
 

diff --git a/tests/btrfs/031 b/tests/btrfs/031
index e158a57d1534a7b3566ad4c05a843604816f68cc..bcd332c385e0ac596266ec724a88f4dce650c716 100644 (file)
--- a/tests/btrfs/031
+++ b/tests/btrfs/031
@@ -53,6 +53,7 @@ _cleanup()
 _supported_fs btrfs
 _supported_os Linux
 
+_require_test
 _require_scratch
 _require_cp_reflink
 

diff --git a/tests/btrfs/041 b/tests/btrfs/041
index b86e2f59e5c5dd344bc2f89624d3a2616d34970e..9639787471dccdef2518c44613406e6ec34b1ff2 100755 (executable)
--- a/tests/btrfs/041
+++ b/tests/btrfs/041
@@ -51,6 +51,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs btrfs
 _supported_os Linux
+_require_test
 _require_scratch
 _need_to_be_root
 

diff --git a/tests/btrfs/046 b/tests/btrfs/046
index c0d10e1b631c388b8517ae7dca75f470eafcab2d..288fb7f61fc6c72a79145e4d7d2fa6f850792483 100644 (file)
--- a/tests/btrfs/046
+++ b/tests/btrfs/046
@@ -51,6 +51,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs btrfs
 _supported_os Linux
+_require_test
 _require_scratch
 _require_fssum
 _need_to_be_root

diff --git a/tests/btrfs/047 b/tests/btrfs/047
index 8b20e79e9c460fb94146e92805b57e43fd18fd41..2c50bf6970d22a2708c7ad3fc190d9c942c4f6a1 100755 (executable)
--- a/tests/btrfs/047
+++ b/tests/btrfs/047
@@ -57,6 +57,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs btrfs
 _supported_os Linux
+_require_test
 _require_scratch
 _require_fssum
 _require_xfs_io_command "fiemap"

diff --git a/tests/btrfs/048 b/tests/btrfs/048
index 2a9bfc396511aab237945d6b46538fa8fc0a3ec1..dc7386d79c53728f1d2832b85a45762ae1f15114 100755 (executable)
--- a/tests/btrfs/048
+++ b/tests/btrfs/048
@@ -45,6 +45,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs btrfs
 _supported_os Linux
+_require_test
 _require_scratch
 _require_btrfs "property"
 _need_to_be_root

diff --git a/tests/btrfs/050 b/tests/btrfs/050
index 9079408531461e8f0fcbb9943f142d78f3d8d5b1..b72408aa6eaa691c887ff96d36c6166706c1b5af 100755 (executable)
--- a/tests/btrfs/050
+++ b/tests/btrfs/050
@@ -51,6 +51,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs btrfs
 _supported_os Linux
+_require_test
 _require_scratch
 _require_fssum
 _need_to_be_root

diff --git a/tests/btrfs/051 b/tests/btrfs/051
index deaa7654562fa6e0b6648670211c3c5298488ec5..1ddfb7449dc849d9788dd1277254992df391a0a8 100755 (executable)
--- a/tests/btrfs/051
+++ b/tests/btrfs/051
@@ -48,6 +48,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs btrfs
 _supported_os Linux
+_require_test
 _require_scratch
 _require_fssum
 _need_to_be_root

diff --git a/tests/btrfs/053 b/tests/btrfs/053
index 7eef55ffc77f9caa12060bb8b5fb2fa70f2caa03..43a831cddfa38a178ce2f41bac48638f4ba7f122 100755 (executable)
--- a/tests/btrfs/053
+++ b/tests/btrfs/053
@@ -50,6 +50,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs btrfs
 _supported_os Linux
+_require_test
 _require_scratch
 _require_fssum
 _require_attrs

diff --git a/tests/btrfs/054 b/tests/btrfs/054
index 258eead547ef4e0582ec5e8fa05ea3c3db737834..33241b0f94f06f350814b9f8e5c51e36e31f0ab7 100755 (executable)
--- a/tests/btrfs/054
+++ b/tests/btrfs/054
@@ -58,6 +58,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs btrfs
 _supported_os Linux
+_require_test
 _require_scratch
 _need_to_be_root
 

diff --git a/tests/ext4/001 b/tests/ext4/001
index 827d8066cde269c32d63aa78d10be51ec2939ea4..5409f488dd544a5153107a189023f90bb1f636f3 100755 (executable)
--- a/tests/ext4/001
+++ b/tests/ext4/001
@@ -46,6 +46,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 _supported_fs ext4
 _supported_os Linux
 _require_xfs_io_command "fzero"
+_require_test
 
 testfile=$TEST_DIR/001.$$
 

diff --git a/tests/ext4/002 b/tests/ext4/002
index 8cb3fd14ad892bb952c8ae185853897a1aac1043..035ea7b5e2d8ca14349bc476a54a94067af96d85 100755 (executable)
--- a/tests/ext4/002
+++ b/tests/ext4/002
@@ -120,6 +120,7 @@ _check_ext4_eof_flag()
 _supported_fs ext4
 _supported_os Linux
 _require_xfs_io_command "falloc"
+_require_test
 
 # Real QA test starts here.
 rm -f $seqres.full

diff --git a/tests/generic/001 b/tests/generic/001
index 6e5f3ddff5ca51f547b747ccb69d76aa574be96e..e977a01815449719ee641cfafb805832af6b05a5 100755 (executable)
--- a/tests/generic/001
+++ b/tests/generic/001
@@ -48,6 +48,7 @@ trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 verbose=true
 verify=$here/verify_fill

diff --git a/tests/generic/002 b/tests/generic/002
index 656d29ff2ff4aadb69dd2a62c7211d5502237ce1..f63b208f79da3f33a3da48a84f517b4282758646 100755 (executable)
--- a/tests/generic/002
+++ b/tests/generic/002
@@ -43,6 +43,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 echo "Silence is goodness ..."
 

diff --git a/tests/generic/004 b/tests/generic/004
index 23ca34901888e54d5853a24c38000f9b1d7d15e4..c7aa473599744d80d26996d29163ed5601523dcb 100755 (executable)
--- a/tests/generic/004
+++ b/tests/generic/004
@@ -44,6 +44,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_xfs_io_command "flink"
 
 testfile="${TEST_DIR}/tst-tmpfile-flink"

diff --git a/tests/generic/005 b/tests/generic/005
index 544af14010eb399106c6b2a35791e31bff312338..d78e43fbd301a989b1bcc00f74fbd7d8797cf955 100755 (executable)
--- a/tests/generic/005
+++ b/tests/generic/005
@@ -66,6 +66,7 @@ _touch()
 
 # real QA test starts here
 _supported_fs generic
+_require_test
 
 # IRIX UDF does not support symlinks
 if [ $FSTYP == 'udf' ]; then

diff --git a/tests/generic/006 b/tests/generic/006
index 481e1f132b86d4a189a6089a2bea8a178220dc28..7a38dbfab747cae64c9d0d5cc05f6f210cfc9ee4 100755 (executable)
--- a/tests/generic/006
+++ b/tests/generic/006
@@ -54,6 +54,7 @@ _count()
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 mkdir $TEST_DIR/permname.$$
 

diff --git a/tests/generic/007 b/tests/generic/007
index abbee74a8472bff2d4887ffee6ad9a56b8867bff..88cd6ccf078cf78f8a79c49e22a6b4ce366ddff1 100755 (executable)
--- a/tests/generic/007
+++ b/tests/generic/007
@@ -48,6 +48,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 status=1 # default failure 
 sourcefile=$tmp.nametest

diff --git a/tests/generic/008 b/tests/generic/008
index 65e16617ba2835c729e4d9f91f7e037fab343b33..9b70b2877ffda916a2021c26f1ab2713fa108da2 100755 (executable)
--- a/tests/generic/008
+++ b/tests/generic/008
@@ -44,6 +44,7 @@ trap "exit \$status" 0 1 2 3 15
 _supported_os Linux
 
 _require_xfs_io_command "fzero"
+_require_test
 
 testfile=$TEST_DIR/008.$$
 

diff --git a/tests/generic/009 b/tests/generic/009
index 08eafb90fe0a53229dcba73caca9f10dae2df98d..7fbec3443e3cb696fe03620a6617078a56b85def 100755 (executable)
--- a/tests/generic/009
+++ b/tests/generic/009
@@ -45,6 +45,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_os Linux
 _require_xfs_io_command "fzero"
+_require_test
 
 testfile=$TEST_DIR/009.$$
 

diff --git a/tests/generic/010 b/tests/generic/010
index 9d2e76ab43340282dea42a262345ba4a581dacb6..ea8ea50acd8df2bd31e6a023ce557aa9136c59ac 100755 (executable)
--- a/tests/generic/010
+++ b/tests/generic/010
@@ -56,6 +56,7 @@ _filter_dbtest()
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 rm -f $seqres.full
 

diff --git a/tests/generic/011 b/tests/generic/011
index bed23aa743bb07cbcad0678659189ae3403935b1..f3c2f7cfc19e4f63f3823afda22aca99bb9021ef 100755 (executable)
--- a/tests/generic/011
+++ b/tests/generic/011
@@ -46,6 +46,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 out=$TEST_DIR/dirstress.$$
 

diff --git a/tests/generic/012 b/tests/generic/012
index 730625bba6938d2a84cdc4605f17d1d6a008fe45..6b1e20b8a8c5fc17f31f78d9f74f22544f6ad988 100755 (executable)
--- a/tests/generic/012
+++ b/tests/generic/012
@@ -51,6 +51,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fiemap"

diff --git a/tests/generic/013 b/tests/generic/013
index 8e76d3da7d23e955b7a905a5daf7a2aa6404bd59..93d99047e4afa910b35395916fa01e64df52d4f3 100755 (executable)
--- a/tests/generic/013
+++ b/tests/generic/013
@@ -91,6 +91,7 @@ _do_test()
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 rm -f $seqres.full
 echo "brevity is wit..."

diff --git a/tests/generic/014 b/tests/generic/014
index a9c26381dcf0d204f9a9f7fc4c51416d84f0e21b..79619619eb7f73ca3134c1693536787c51a7558a 100755 (executable)
--- a/tests/generic/014
+++ b/tests/generic/014
@@ -45,6 +45,7 @@ _cleanup()
 _supported_fs generic
 _supported_os IRIX Linux
 
+_require_test
 _require_sparse_files
 
 # ensure EOF preallocation doesn't massively extend the runtime of this test

diff --git a/tests/generic/016 b/tests/generic/016
index 15a255190b1c80b7682c501a50d796329850e169..b994775e158b6286a6d1b79a6382a7f752828307 100755 (executable)
--- a/tests/generic/016
+++ b/tests/generic/016
@@ -51,6 +51,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fiemap"

diff --git a/tests/generic/020 b/tests/generic/020
index a9bd17a0cfc8a4073e84e9e021db3ffc4bafdae8..49230da0d6df535af5059b81c25696e42485a73b 100755 (executable)
--- a/tests/generic/020
+++ b/tests/generic/020
@@ -76,6 +76,7 @@ _attr_list()
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_attrs
 
 rm -f $seqres.full

diff --git a/tests/generic/021 b/tests/generic/021
index eb88e016dace8aa2b03b7d8b7082258723a3612a..4729400fbeac8c71656302ed9b0b1e8f7f3c15a9 100755 (executable)
--- a/tests/generic/021
+++ b/tests/generic/021
@@ -51,6 +51,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fiemap"

diff --git a/tests/generic/022 b/tests/generic/022
index 55bf8c54938d05e9386a5b15c4d7dd379a77612a..1228e51698b3b05ce49b230e3e207c1d007b9cce 100755 (executable)
--- a/tests/generic/022
+++ b/tests/generic/022
@@ -51,6 +51,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fiemap"

diff --git a/tests/generic/023 b/tests/generic/023
index aaf196a2974b7dbe790fe8dcef82960e9f9cbbe3..114485c22719a9999f799b135b7a74825b071e7c 100755 (executable)
--- a/tests/generic/023
+++ b/tests/generic/023
@@ -43,6 +43,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _requires_renameat2
 
 # real QA test starts here

diff --git a/tests/generic/024 b/tests/generic/024
index fa61169fab22bc78c3ce543adf052c956c08b3b4..8945191cfd34c81fc9c866a1dd958d771d2779f7 100755 (executable)
--- a/tests/generic/024
+++ b/tests/generic/024
@@ -43,6 +43,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _requires_renameat2
 
 rename_dir=$TEST_DIR/$$

diff --git a/tests/generic/025 b/tests/generic/025
index 251fffe55558f19125ff7cd9b8bc04f999c890c2..6b6c8abb12578bcdae7b040e2f126442cca96b46 100755 (executable)
--- a/tests/generic/025
+++ b/tests/generic/025
@@ -43,6 +43,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _requires_renameat2
 
 rename_dir=$TEST_DIR/$$

diff --git a/tests/generic/026 b/tests/generic/026
index 6dae9669ede086efe0b27a8ce51a443e51c7c29b..ab75839cf7111138aa11e9cb0dea27ab40c91eca 100755 (executable)
--- a/tests/generic/026
+++ b/tests/generic/026
@@ -48,6 +48,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 _require_scratch
 _need_to_be_root
 _acl_setup_ids

diff --git a/tests/generic/028 b/tests/generic/028
index eb3c7996f01e9bc9998fedf52d63780f2860e80a..f181d3e8bbe426bf079948bc2fdf32490dfca9e9 100755 (executable)
--- a/tests/generic/028
+++ b/tests/generic/028
@@ -50,6 +50,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 echo "Silence is golden"
 

diff --git a/tests/generic/070 b/tests/generic/070
index f593d84eb55c27166391187d2910371293fdda45..7591b25cd4b8b7131726dd4a04c699b97f0149fc 100755 (executable)
--- a/tests/generic/070
+++ b/tests/generic/070
@@ -47,6 +47,7 @@ _cleanup()
 _supported_fs generic
 _supported_os IRIX Linux
 
+_require_test
 _require_attrs
 
 FSSTRESS_ARGS=`_scale_fsstress_args \

diff --git a/tests/generic/074 b/tests/generic/074
index 668132ed38a4cb828c8c284ced2e3d4ed0f906ea..df85d662ae1332e14aae870ea7dd0f904552ab1f 100755 (executable)
--- a/tests/generic/074
+++ b/tests/generic/074
@@ -110,6 +110,7 @@ rm -f $seqres.full
 
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 #
 # set params

diff --git a/tests/generic/075 b/tests/generic/075
index af4f34b2190df89c1bb5cfe46387b503d32beed1..a2411c66c291c1ee6a077fb6f1924db91f0a021d 100755 (executable)
--- a/tests/generic/075
+++ b/tests/generic/075
@@ -123,6 +123,7 @@ _process_args()
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 size10=`expr 10 \* 1024 \* 1024`       # 10 megabytes
 filelen=$size10

diff --git a/tests/generic/088 b/tests/generic/088
index fce6489e2e2bacdd6a327b533ed51b33a8050b40..983de983c0599173c35795e7a289a64836310955 100755 (executable)
--- a/tests/generic/088
+++ b/tests/generic/088
@@ -48,6 +48,7 @@ _link_out_file $seq.out $seqfull.out
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 path=$TEST_DIR/t_access
 src/t_access_root $path | tee $seqres.full | _filter

diff --git a/tests/generic/089 b/tests/generic/089
index fdddad41bc2badcf360155a4799500b1a47f05e2..4324f83a4b9b70807774be7132fbe4f88f77c7f6 100755 (executable)
--- a/tests/generic/089
+++ b/tests/generic/089
@@ -51,6 +51,7 @@ addentries()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 rm -f $seqres.full
 [ "X$TEST_DIR" = "X" ] && exit 1

diff --git a/tests/generic/091 b/tests/generic/091
index e7b60fef1f3f517cab3c5566570dfd19d3c29454..3775016bbed02b32ead1886c752e8166ce52ff5f 100755 (executable)
--- a/tests/generic/091
+++ b/tests/generic/091
@@ -38,6 +38,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 rm -f $seqres.full
 

diff --git a/tests/generic/093 b/tests/generic/093
index fe20f380a51dce4603e7fa79b0561fd70ea3f13b..8f810a663feea69a9428f765cebdf020824bfeae 100755 (executable)
--- a/tests/generic/093
+++ b/tests/generic/093
@@ -58,6 +58,7 @@ _filefilter()
 _supported_fs generic
 _supported_os IRIX
 
+_require_test
 _require_attrs
 
 [ -x $runas ] || _notrun "$runas executable not found"

diff --git a/tests/generic/097 b/tests/generic/097
index f40d5d5d1160310df580f1a71d4459d2ee74e511..637c73b70388d4c285863dfb78b60cfa62e9e0b4 100755 (executable)
--- a/tests/generic/097
+++ b/tests/generic/097
@@ -75,6 +75,7 @@ fi
 _supported_fs generic
 _supported_os IRIX
 
+_require_test
 _require_scratch
 _require_attrs
 

diff --git a/tests/generic/099 b/tests/generic/099
index 83097e915b329c396753809515095b2bd2337795..b544fe265fe04bddfa997ee50a1628d27654e9b8 100755 (executable)
--- a/tests/generic/099
+++ b/tests/generic/099
@@ -80,6 +80,7 @@ rm -f $seqres.full
 _supported_fs generic
 _supported_os IRIX
 
+_require_test
 _acl_setup_ids
 _require_acls
 

diff --git a/tests/generic/100 b/tests/generic/100
index 00ba23edddf94332bdf38ed9725f70edcb4734c0..59b8e7539789e91db9843bd5938ab53dcaf80756 100755 (executable)
--- a/tests/generic/100
+++ b/tests/generic/100
@@ -44,6 +44,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 # Use _populate_fs() in common/rc to create a directory structure.
 TEMP_DIR=/tmp

diff --git a/tests/generic/112 b/tests/generic/112
index 1e34d99de7e1c07bcf546738bfaf67545c9efa97..b59cbfa2c3e00f891aa0bb9e1d82833147dd14fd 100755 (executable)
--- a/tests/generic/112
+++ b/tests/generic/112
@@ -121,6 +121,7 @@ _process_args()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 [ -x $here/ltp/aio-stress ] || \
        _notrun "fsx not built with AIO for this platform"

diff --git a/tests/generic/113 b/tests/generic/113
index 56672f036e66312e9e8eece549c2c54b0c878b03..7208fa29c0fc3c81a35ded7512b04880f992c55f 100755 (executable)
--- a/tests/generic/113
+++ b/tests/generic/113
@@ -76,6 +76,7 @@ _do_test()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 [ -x $here/ltp/aio-stress ] || _notrun "aio-stress not built for this platform"
 

diff --git a/tests/generic/123 b/tests/generic/123
index 911e9d2fc26ead3ce65681db5e515431b2dd7745..453ede4b488ed5f64d30371bb2840b44b9a87b16 100755 (executable)
--- a/tests/generic/123
+++ b/tests/generic/123
@@ -48,6 +48,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux IRIX
 
+_require_test
 _require_user
 
 my_test_subdir=$TEST_DIR/123subdir

diff --git a/tests/generic/124 b/tests/generic/124
index 77f6e7d72b54ca1d26a3690725111638017c61b7..888bbc0bc2918365e177dc9e0c7550ba77ecf4d4 100755 (executable)
--- a/tests/generic/124
+++ b/tests/generic/124
@@ -48,6 +48,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_scratch
 _scratch_mkfs >/dev/null 2>&1
 _scratch_mount

diff --git a/tests/generic/125 b/tests/generic/125
index f4ffea5b1faa0e6d56214875122533acf11d7997..bcf9b3e3d19c80a3ae8cecbbcf3010adf2b6d2cb 100755 (executable)
--- a/tests/generic/125
+++ b/tests/generic/125
@@ -39,6 +39,7 @@ trap "exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_user
 
 TESTDIR=$TEST_DIR/ftrunc

diff --git a/tests/generic/126 b/tests/generic/126
index 17965270def69d76eb487ca14a2efeaba27932a8..a22d5872e3968eb58f602f380a1bc757c025257b 100755 (executable)
--- a/tests/generic/126
+++ b/tests/generic/126
@@ -43,6 +43,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 QA_FS_PERMS=$here/src/fs_perms
 

diff --git a/tests/generic/127 b/tests/generic/127
index f6b7f9553c7763e5ea36e948c9520e102e92ca75..94d15b291950787a8ff9f255b482e421535783e8 100755 (executable)
--- a/tests/generic/127
+++ b/tests/generic/127
@@ -104,6 +104,7 @@ _fsx_std_mmap()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 _fsx_lite_nommap
 _fsx_lite_mmap

diff --git a/tests/generic/131 b/tests/generic/131
index ce3e490e49cec68fc0e28aab9f339ce10d498730..b4e3ff067b0ca802c904f2b844a0f0ac987a3984 100755 (executable)
--- a/tests/generic/131
+++ b/tests/generic/131
@@ -44,6 +44,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 TESTFILE=$TEST_DIR/lock_file
 

diff --git a/tests/generic/133 b/tests/generic/133
index 7fb1695e033623256e30933929b4918aad58e006..f1d67aa60abce8fab175610d5c2d8d6be418e26c 100755 (executable)
--- a/tests/generic/133
+++ b/tests/generic/133
@@ -38,6 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux IRIX
+_require_test
 
 echo "Buffered writer, buffered reader"
 $XFS_IO_PROG -f -d -c 'pwrite -b 64k 0 512m' $TEST_DIR/io_test > /dev/null

diff --git a/tests/generic/184 b/tests/generic/184
index dcc8b4efb8d399b52164eed1661505f4cc87ea16..d7c0eb9a9770b69a426cdd1dd518400a333e45a4 100755 (executable)
--- a/tests/generic/184
+++ b/tests/generic/184
@@ -44,6 +44,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 rm -f $TEST_DIR/null
 mknod $TEST_DIR/null c 1 3

diff --git a/tests/generic/192 b/tests/generic/192
index 2b4e41c3719e1c2e7f39cb526805d3f4b7f7236b..f630be9c50642024bf96d9d466c7e188cabddb67 100755 (executable)
--- a/tests/generic/192
+++ b/tests/generic/192
@@ -53,6 +53,7 @@ is_noatime_set() {
 
 _supported_fs generic
 _supported_os Linux
+_require_test
 #delay=150
 #delay=75
 #delay=60

diff --git a/tests/generic/193 b/tests/generic/193
index 4fa20ffde0fdf577a68dafca743989fcb27b6622..cd3c0b0e6565cfad82a04163d80de98cadda0d0d 100755 (executable)
--- a/tests/generic/193
+++ b/tests/generic/193
@@ -70,6 +70,7 @@ _filter_files()
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_user
 _need_to_be_root
 

diff --git a/tests/generic/198 b/tests/generic/198
index 5190d34758211cef81ea2fb6bf0181f01fdee96f..5978f54a82126262a30a43dbcdbfcb3cd7b60ce9 100755 (executable)
--- a/tests/generic/198
+++ b/tests/generic/198
@@ -44,6 +44,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_aiodio aiodio_sparse2
+_require_test
 
 echo "Silence is golden."
 

diff --git a/tests/generic/207 b/tests/generic/207
index 0709061a55d8daca3b80457ceb79664ef4750960..8f22c55b8e037655c0909da24757a2676302d4f8 100755 (executable)
--- a/tests/generic/207
+++ b/tests/generic/207
@@ -44,6 +44,7 @@ _cleanup()
 
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 _run_aiodio aio-dio-extend-stat
 

diff --git a/tests/generic/208 b/tests/generic/208
index 58d1d083ad0d5f9341d4b35a8e3a991c23a7b68b..f57e2bc76f8bfff432f8c622964d0174ccb07e38 100755 (executable)
--- a/tests/generic/208
+++ b/tests/generic/208
@@ -44,6 +44,7 @@ _cleanup()
 
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 rm -f $seqres.full
 

diff --git a/tests/generic/209 b/tests/generic/209
index 2abafcff018bccaba756017265a04994a7afe39f..aface56754e122fb16bf8c52f0aeba385e21f204 100755 (executable)
--- a/tests/generic/209
+++ b/tests/generic/209
@@ -44,6 +44,7 @@ _cleanup()
 
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 _run_aiodio aio-dio-invalidate-readahead
 

diff --git a/tests/generic/210 b/tests/generic/210
index ebeb137bd583923aebe99cf31319bb97fb8aec6d..6abd3b41fd8fca020731ac633799285df647778c 100755 (executable)
--- a/tests/generic/210
+++ b/tests/generic/210
@@ -44,6 +44,7 @@ _cleanup()
 
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 _run_aiodio aio-dio-subblock-eof-read
 

diff --git a/tests/generic/211 b/tests/generic/211
index d1110f5e3d8a7e163b8f887f9a8b2fa2a3eca8ea..e0afeff1052e4f19ac53ca4931121775bbd59999 100755 (executable)
--- a/tests/generic/211
+++ b/tests/generic/211
@@ -44,6 +44,7 @@ _cleanup()
 
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 _run_aiodio aio-free-ring-with-bogus-nr-pages
 

diff --git a/tests/generic/212 b/tests/generic/212
index 23ceae0539de593f5f66f2429281b490962db6a9..e3b2dad66bcca6767cefcc59525b0f5bb2b2078b 100755 (executable)
--- a/tests/generic/212
+++ b/tests/generic/212
@@ -45,6 +45,7 @@ _cleanup()
 
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 _run_aiodio aio-io-setup-with-nonwritable-context-pointer
 

diff --git a/tests/generic/213 b/tests/generic/213
index c99520ffc4649ff63508661a933b4f7a38a36539..609fcf1484f306ea6d892156693f267b2bc20be7 100755 (executable)
--- a/tests/generic/213
+++ b/tests/generic/213
@@ -54,6 +54,7 @@ _supported_os Linux
 
 rm -f $seqres.full
 
+_require_test
 _require_xfs_io_command "falloc"
 
 # check there's enough freespace on $TEST_DIR ... (1GiB + 1MiB)

diff --git a/tests/generic/214 b/tests/generic/214
index 444c1fe1a078669a21534917fad88f69c76a0eba..dff267e869c994c73997ef92ff3a404c4c4c1884 100755 (executable)
--- a/tests/generic/214
+++ b/tests/generic/214
@@ -47,6 +47,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs generic
 # only Linux supports fallocate
 _supported_os Linux
+_require_test
 
 [ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found"
 

diff --git a/tests/generic/215 b/tests/generic/215
index eaae8d8cbc9b29354b066e12e32b816958cfc339..6ddd1fcffb0b75c3406eba89cd41ee20e9c3ed78 100755 (executable)
--- a/tests/generic/215
+++ b/tests/generic/215
@@ -45,6 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 testfile=$TEST_DIR/tst.mmap
 

diff --git a/tests/generic/221 b/tests/generic/221
index e7d474095bbdbc604d36023fc3e43d7b87c23197..aa42f65b5412ad15b8fdf8288cd78ae40ad3bba1 100755 (executable)
--- a/tests/generic/221
+++ b/tests/generic/221
@@ -39,6 +39,7 @@ status=1      # failure is the default!
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 echo "Silence is golden."
 

diff --git a/tests/generic/228 b/tests/generic/228
index 7ac0872a69b3d0c895a44bda7b334a9089aa3ec2..1856dec50d5177faf9e13406e11095815f5625a3 100755 (executable)
--- a/tests/generic/228
+++ b/tests/generic/228
@@ -47,6 +47,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 25
 _supported_fs generic
 # only Linux supports fallocate
 _supported_os Linux
+_require_test
 
 [ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found"
 

diff --git a/tests/generic/236 b/tests/generic/236
index 10cf71afdf48f2e53753a6661719c160ef3922b1..12ea0bc689f267a8ba9641462d9f8cb35727e167 100755 (executable)
--- a/tests/generic/236
+++ b/tests/generic/236
@@ -43,6 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs generic
 # only Linux supports fallocate
 _supported_os Linux
+_require_test
 
 rm -f $TEST_DIR/ouch*
 

diff --git a/tests/generic/237 b/tests/generic/237
index 6a61ec891c956b8cfa993fb850e9c1910a535761..ff11ed35abfd34585ed11fccd7b698713cec5c7a 100755 (executable)
--- a/tests/generic/237
+++ b/tests/generic/237
@@ -49,6 +49,7 @@ _cleanup()
 _supported_fs generic
 # only Linux supports fallocate
 _supported_os Linux
+_require_test
 
 [ -x $runas ] || _notrun "$runas executable not found"
 

diff --git a/tests/generic/239 b/tests/generic/239
index bf39953f0b3c5acc6e3225e2a55305e782145b8b..4f764c223512c6a3ea8708a44fd38b2081277079 100755 (executable)
--- a/tests/generic/239
+++ b/tests/generic/239
@@ -44,6 +44,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_sparse_files
 _require_aiodio aio-dio-hole-filling-race
 

diff --git a/tests/generic/240 b/tests/generic/240
index 74dbba67a27a094d96d6493ed4fc54654a1ed055..c063dd48c2383d9fd53a2aac58b7df30a196d0a8 100755 (executable)
--- a/tests/generic/240
+++ b/tests/generic/240
@@ -50,6 +50,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_sparse_files
 _require_aiodio aiodio_sparse2
 

diff --git a/tests/generic/241 b/tests/generic/241
index 7c3f6e8ef120dd40ad1d3325779255e93f07f92a..b45f5e96ada666678b3df95ccdf0578a12f95f57 100755 (executable)
--- a/tests/generic/241
+++ b/tests/generic/241
@@ -42,6 +42,7 @@ _cleanup()
 
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 [ "$DBENCH_PROG" = "" ] && _notrun "dbench not found"
 

diff --git a/tests/generic/245 b/tests/generic/245
index 9b87fbbf07b02ace66cdd3c2fdd5164732647c1e..4034d04934f75930339ff4aad59983a2fa62b78a 100755 (executable)
--- a/tests/generic/245
+++ b/tests/generic/245
@@ -39,6 +39,7 @@ status=1      # failure is the default!
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 dir=$TEST_DIR/test-mv
 

diff --git a/tests/generic/246 b/tests/generic/246
index dd809fb20b481db42655e5c9ac7c6429eabdaba5..4184cfc6308153768e432aa8e4971b65dc0f302f 100755 (executable)
--- a/tests/generic/246
+++ b/tests/generic/246
@@ -40,6 +40,7 @@ status=1      # failure is the default!
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 file=$TEST_DIR/mmap-writev
 

diff --git a/tests/generic/247 b/tests/generic/247
index 5f16281c3c4524422d25c17230ee54a2719717f8..c8648a2a5479ca11ace0a2131a8810d7e71d6a66 100755 (executable)
--- a/tests/generic/247
+++ b/tests/generic/247
@@ -46,6 +46,7 @@ _cleanup()
 # Modify as appropriate.
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 testfile=$TEST_DIR/$seq.$$
 

diff --git a/tests/generic/248 b/tests/generic/248
index 873313db6d7258ba90a51ddca0f5f13a11ff1807..f47d47f71489228d41dc7ed361f6da43d2bdbeed 100755 (executable)
--- a/tests/generic/248
+++ b/tests/generic/248
@@ -46,6 +46,7 @@ _cleanup()
 # Modify as appropriate.
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 TESTFILE=$TEST_DIR/test_file
 TEST_PROG=$here/src/pwrite_mmap_blocked

diff --git a/tests/generic/249 b/tests/generic/249
index 306e820ddc10f547f6e02560c4700f94fffb7cb5..d8b4df4742d086058d913fbc72075a3740212bc2 100755 (executable)
--- a/tests/generic/249
+++ b/tests/generic/249
@@ -44,6 +44,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 echo "Feel the serenity."
 

diff --git a/tests/generic/255 b/tests/generic/255
index 8419065eebcd60e792281b8022fb721cf37aa24a..14de49ed475926187590ececf379ae017491617f 100755 (executable)
--- a/tests/generic/255
+++ b/tests/generic/255
@@ -46,6 +46,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 _supported_fs generic 
 _supported_os Linux
 
+_require_test
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fiemap"

diff --git a/tests/generic/256 b/tests/generic/256
index e6cc7dcff4780a06e04f4ed937a585b769601210..8ee8aaccc540b59e038a9e0214b669a2b027e8f0 100755 (executable)
--- a/tests/generic/256
+++ b/tests/generic/256
@@ -49,6 +49,7 @@ _supported_os Linux
 _require_xfs_io_command "fpunch"
 _require_scratch
 _require_user
+_require_test
 
 testfile=$TEST_DIR/256.$$
 

diff --git a/tests/generic/257 b/tests/generic/257
index a9ce73b97d97b73f9657d89c94cf272dd69b7bd4..64f210017bd6e0fde936a2f82b27dd30612bc3fa 100755 (executable)
--- a/tests/generic/257
+++ b/tests/generic/257
@@ -42,6 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 mkdir $TEST_DIR/ttt
 for n in {1..168}; do

diff --git a/tests/generic/258 b/tests/generic/258
index 3aeb5ce0dea816056f233b994d16f5ac226835aa..b9b5cf9bfe4e6a22e628de66790ba9f38b150cdf 100755 (executable)
--- a/tests/generic/258
+++ b/tests/generic/258
@@ -45,6 +45,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 TESTFILE=$TEST_DIR/timestamp-test.txt
 

diff --git a/tests/generic/263 b/tests/generic/263
index 6ecb74ddffcab089125b6c8a9629fd2eb10dbb16..6ee21654fb8515527bb38ce17af41c68043f6e97 100755 (executable)
--- a/tests/generic/263
+++ b/tests/generic/263
@@ -38,6 +38,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 rm -f $seqres.full
 

diff --git a/tests/generic/285 b/tests/generic/285
index ac34d34e7b7184b7362d62414ddcf08c70a4a8ac..d6275b5fdcd0e845bba289867aeaeec77197cad1 100755 (executable)
--- a/tests/generic/285
+++ b/tests/generic/285
@@ -40,6 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_seek_data_hole
 
 BASE_TEST_FILE=$TEST_DIR/seek_sanity_testfile

diff --git a/tests/generic/286 b/tests/generic/286
index f4fe39a83977c7e49d9747c4c36c68ddfa441a78..94c22c62c308ab7016f007fb077661277b1aff9c 100755 (executable)
--- a/tests/generic/286
+++ b/tests/generic/286
@@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_seek_data_hole
 
 src=$TEST_DIR/seek_copy_testfile

diff --git a/tests/generic/306 b/tests/generic/306
index 04d28dff573514e4b3a4083504242fede1ab16a5..64d8cded120674e9d099b4258a7fafcfd47dc72e 100755 (executable)
--- a/tests/generic/306
+++ b/tests/generic/306
@@ -47,6 +47,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_test
 
 DEVNULL=$SCRATCH_MNT/devnull
 DEVZERO=$SCRATCH_MNT/devzero

diff --git a/tests/generic/308 b/tests/generic/308
index 8037c085f2562e26d07faac2332e60d1ec5ad5fb..418dbf27a0bc56a94a1d551cc08442294082a1b1 100755 (executable)
--- a/tests/generic/308
+++ b/tests/generic/308
@@ -44,6 +44,7 @@ testfile=$TEST_DIR/testfile.$seq
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 rm -f $seqres.full
 echo "Silence is golden"

diff --git a/tests/generic/309 b/tests/generic/309
index cbaf3071e1f456e9048b8ce0389804fa59d2fcda..c6b89db99e6cc82e664ef29888369dd4fc44bcb5 100755 (executable)
--- a/tests/generic/309
+++ b/tests/generic/309
@@ -46,6 +46,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 echo "Silence is golden"
 

diff --git a/tests/generic/310 b/tests/generic/310
index 26d2d4a7ec892fff0a21c902608572ffc4d89fcb..9d46e87ec754ab2c89277b2b848d4bb6a11499b4 100755 (executable)
--- a/tests/generic/310
+++ b/tests/generic/310
@@ -57,6 +57,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 dmesg -c > /dev/null
 

diff --git a/tests/generic/313 b/tests/generic/313
index 623c777f61d4f05cf0494d49e023d236f61c4a29..a906926094df6e634d8ac225545d5eebec3b90f1 100755 (executable)
--- a/tests/generic/313
+++ b/tests/generic/313
@@ -45,6 +45,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs generic
 _supported_os IRIX Linux
+_require_test
 
 testfile=$TEST_DIR/testfile.$seq
 

diff --git a/tests/generic/314 b/tests/generic/314
index f430b82547f364b7c415917908c7000049dbf4d1..294fb234aa5617a293c68d2d2e23544dd2e15a4a 100755 (executable)
--- a/tests/generic/314
+++ b/tests/generic/314
@@ -43,6 +43,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs generic
+_require_test
 _require_acls
 _require_user
 _need_to_be_root

diff --git a/tests/generic/315 b/tests/generic/315
index 9c01b5efd03468f416f749645128849ac2082471..62fdc0116b794c7141e7b2e2d394edba58d53735 100755 (executable)
--- a/tests/generic/315
+++ b/tests/generic/315
@@ -48,6 +48,7 @@ _cleanup()
 # Modify as appropriate.
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 rm -f $seqres.full
 

diff --git a/tests/generic/316 b/tests/generic/316
index 29a4331f9d217cc2ad9e5876ec4828aa755dc4dd..0ccf01f5e6a0e4541e4d898cebb499f10d7744cf 100755 (executable)
--- a/tests/generic/316
+++ b/tests/generic/316
@@ -45,6 +45,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 
+_require_test
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "fiemap"
 

diff --git a/tests/generic/323 b/tests/generic/323
index b84cfc85af5e7ef1cbc0af08c2cd5d160dc20f30..16b811c7fd06eff86870974ec83288893389f177 100644 (file)
--- a/tests/generic/323
+++ b/tests/generic/323
@@ -47,6 +47,7 @@ _cleanup()
 
 _supported_fs generic
 _supported_os Linux
+_require_test
 
 _require_aiodio aio-last-ref-held-by-io
 

diff --git a/tests/shared/051 b/tests/shared/051
index 2b61f45bd9837eeda3b718ebd16b67d05a40313f..44dfd64ca5806acd77afef5e995dc6c3d954eb99 100755 (executable)
--- a/tests/shared/051
+++ b/tests/shared/051
@@ -70,6 +70,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs xfs udf
 _supported_os Linux
+_require_test
 
 [ -x $runas ] || _notrun "$runas executable not found"
 

diff --git a/tests/shared/298 b/tests/shared/298
index 8211da39d8c603edd571e553d2a07f911e626a22..372fd026d6b6bf9c58498d9e0333cb9c73705564 100755 (executable)
--- a/tests/shared/298
+++ b/tests/shared/298
@@ -32,6 +32,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fs ext4 xfs
 _supported_os Linux
+_require_test
 _require_loop
 _require_fstrim
 _require_xfs_io_command "fiemap"

diff --git a/tests/xfs/003 b/tests/xfs/003
index 228dd179f69909db8551e78d1973f6a938387408..2eed40fbff50a3753250e629e5c2cc3211ebb794 100755 (executable)
--- a/tests/xfs/003
+++ b/tests/xfs/003
@@ -40,6 +40,7 @@ _need_to_be_root
 # real QA test starts here
 _supported_fs xfs
 _supported_os IRIX Linux
+_require_test
 
 [ -f core ] && rm -f core
 [ -f core ] && echo "Warning: can't nuke existing core file!"

diff --git a/tests/xfs/008 b/tests/xfs/008
index 56be923b856cf5ea15936e7c45fd59d9d84b108e..9f22087dd9924bef937f3cdf1884c565b5e6c16f 100755 (executable)
--- a/tests/xfs/008
+++ b/tests/xfs/008
@@ -87,6 +87,7 @@ _do_test()
 # real QA test starts here
 _supported_fs xfs
 _supported_os IRIX Linux
+_require_test
 
 rm -f $seqres.full
 

diff --git a/tests/xfs/012 b/tests/xfs/012
index 41272226c9c0007900e34e346436033c276830a9..7b9a54d29c99c1bab633d4833cb375634d7c1c0e 100755 (executable)
--- a/tests/xfs/012
+++ b/tests/xfs/012
@@ -104,6 +104,7 @@ _do_test()
 # real QA test starts here
 _supported_fs xfs
 _supported_os IRIX Linux
+_require_test
 
 rm -f $seqres.full
 

diff --git a/tests/xfs/045 b/tests/xfs/045
index 84ca802b2b7ac631624a8d9a12d6a4a2aa338e83..31516b35d33df6e51a8e0ea5e153884b05e21745 100755 (executable)
--- a/tests/xfs/045
+++ b/tests/xfs/045
@@ -44,6 +44,7 @@ _get_existing_uuid()
 _supported_fs xfs
 _supported_os Linux
 
+_require_test
 _require_scratch
 
 echo "*** get uuid"

diff --git a/tests/xfs/048 b/tests/xfs/048
index f9fb16fcdcd9696f9752427edf38a3466d98bbf3..3dd685f06998e34c6fc92a13073b76e47b772eef 100755 (executable)
--- a/tests/xfs/048
+++ b/tests/xfs/048
@@ -44,6 +44,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs xfs
 _supported_os IRIX Linux
+_require_test
 
 src/fault $TEST_DIR || exit
 

diff --git a/tests/xfs/066 b/tests/xfs/066
index db292497d397c1d82da86e8f12add5f17d6750c3..736439b4f820f3b90f1808ab49a996a6a6ca9595 100755 (executable)
--- a/tests/xfs/066
+++ b/tests/xfs/066
@@ -45,6 +45,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs xfs
 _supported_os IRIX Linux
+_require_test
 
 _my_stat_filter()
 {

diff --git a/tests/xfs/073 b/tests/xfs/073
index ca553ae6f4826ff8605f91bd23350a410ddccd3d..f9557719c92fc36aa639e8b7859696966f00894f 100755 (executable)
--- a/tests/xfs/073
+++ b/tests/xfs/073
@@ -126,6 +126,7 @@ _verify_copy()
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
+_require_test
 
 [ "$USE_EXTERNAL" = yes ] && _notrun "Cannot xfs_copy with external devices"
 [ -n "$XFS_COPY_PROG" ] || _notrun "xfs_copy binary not yet installed"

diff --git a/tests/xfs/078 b/tests/xfs/078
index e04c6cccbdfc6543fb3399cbc19ccabc3a9e0556..f859efcffc167f9b6c550cd814e2ed7d5149f99c 100755 (executable)
--- a/tests/xfs/078
+++ b/tests/xfs/078
@@ -48,6 +48,7 @@ _cleanup()
 _supported_fs xfs
 _supported_os Linux
 
+_require_test
 # Must have loop device
 _require_loop
 

diff --git a/tests/xfs/080 b/tests/xfs/080
index 59c6104c2d6f2687efeedf147bd4e127fbfa8c21..e0f5b1b9f7c986ac25d3065a0dbcbe89e8cbbf1f 100755 (executable)
--- a/tests/xfs/080
+++ b/tests/xfs/080
@@ -46,6 +46,7 @@ _supported_fs xfs
 # Apparently should be able to work on IRIX,
 # but not at the moment.
 _supported_os Linux
+_require_test
 
 quiet=-q
 clean=-c

diff --git a/tests/xfs/084 b/tests/xfs/084
index 0d17cf354f428d36a43ed38f9027959574437c25..7aa193b518576edfe2a0ce03fc728060f5739942 100755 (executable)
--- a/tests/xfs/084
+++ b/tests/xfs/084
@@ -51,6 +51,7 @@ pgsize=`$here/src/feature -s`
 # real QA test starts here
 _supported_fs xfs
 _supported_os IRIX Linux
+_require_test
 
 if [ $HOSTOS == "IRIX" ]; then 
     if uname -R | grep -iq debug; then 

diff --git a/tests/xfs/134 b/tests/xfs/134
index 6f092f2caa31a13fde97c0b2e4fca98771292978..adafa396771f2d57a0832bc57e67e91ed485b5ad 100755 (executable)
--- a/tests/xfs/134
+++ b/tests/xfs/134
@@ -48,6 +48,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fs xfs
 _supported_os Linux IRIX
 
+_require_test
 _require_xfs_quota
 
 dir=$SCRATCH_MNT/project

diff --git a/tests/xfs/164 b/tests/xfs/164
index 33a038fccad39a0e444cc16987dff79dc0542535..404c2080ac71ee7d5a04f90f8537faa8a8689311 100755 (executable)
--- a/tests/xfs/164
+++ b/tests/xfs/164
@@ -67,6 +67,7 @@ _filter_bmap()
 # Modify as appropriate.
 _supported_fs xfs
 _supported_os IRIX Linux
+_require_test
 
 testfile=$TEST_DIR/file.$seq
 

diff --git a/tests/xfs/165 b/tests/xfs/165
index bc882daa7893cec4abf26e52935d6a958388cc8a..4080a88d8a4d5c6d0ce676675a5f8200e6e3e285 100755 (executable)
--- a/tests/xfs/165
+++ b/tests/xfs/165
@@ -64,6 +64,7 @@ _filter_bmap()
 # Modify as appropriate.
 _supported_fs xfs
 _supported_os IRIX Linux
+_require_test
 
 # io tests 
 testfile=$TEST_DIR/file.$seq

diff --git a/tests/xfs/195 b/tests/xfs/195
index d67ce9fbae1d618816d4022c580c5cc3ee231bb0..6abddbcaea4cfd36713ab38c92395c64051cdbe3 100755 (executable)
--- a/tests/xfs/195
+++ b/tests/xfs/195
@@ -63,6 +63,7 @@ _do_dump()
 _supported_fs xfs
 _supported_os Linux
 
+_require_test
 _require_user
 
 echo "Preparing subtree"

diff --git a/tests/xfs/197 b/tests/xfs/197
index bc2de9defa2d4491d418a3555e435cfd583ecb05..7706e03a63d32a2278d888e697fab028b0698805 100755 (executable)
--- a/tests/xfs/197
+++ b/tests/xfs/197
@@ -48,6 +48,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
+_require_test
 
 bitsperlong=`src/feature -w`
 if [ "$bitsperlong" -ne 32 ]; then

diff --git a/tests/xfs/206 b/tests/xfs/206
index f739597fb5745cee76dbf7da0b9ff842f2fd5e11..f6dcca6c6d0213025d028a871905bd2076330ca7 100755 (executable)
--- a/tests/xfs/206
+++ b/tests/xfs/206
@@ -53,6 +53,7 @@ _cleanup()
 # Modify as appropriate.
 _supported_fs xfs
 _supported_os IRIX Linux
+_require_test
 _require_loop
 
 bitsperlong=`src/feature -w`

diff --git a/tests/xfs/222 b/tests/xfs/222
index 0e5aaf6acbfabf46c8fcbbd3d94300d660a9f46b..77ecfc614a79ac5484b084071b87b2d45d6aa0db 100755 (executable)
--- a/tests/xfs/222
+++ b/tests/xfs/222
@@ -47,6 +47,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
+_require_test
 
 [ "$XFS_FSR_PROG" = "" ] && _notrun "xfs_fsr not found"
 

diff --git a/tests/xfs/229 b/tests/xfs/229
index 3e0242101f578a01bb67b5af1d391710b6ebdad9..c057677c5dc43684c8595254968eb944e0b05005 100755 (executable)
--- a/tests/xfs/229
+++ b/tests/xfs/229
@@ -49,6 +49,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
+_require_test
 
 TDIR="${TEST_DIR}/t_holes"
 NFILES="10"

diff --git a/tests/xfs/242 b/tests/xfs/242
index 24a572a0691bfeb11faa97677ceb3f7c0e83286c..304e69f6fc89f08caa213adf61a94476e3123bed 100755 (executable)
--- a/tests/xfs/242
+++ b/tests/xfs/242
@@ -45,6 +45,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
+_require_test
 
 _test_io_zero()
 {

diff --git a/tests/xfs/250 b/tests/xfs/250
index 3b67c3fcb3aa804f3f417e7d7b5225ddcca4532d..c1622a4b47d4476fef776b26fe8d470c9897948f 100755 (executable)
--- a/tests/xfs/250
+++ b/tests/xfs/250
@@ -45,6 +45,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
+_require_test
 _require_loop
 
 LOOP_DEV=$TEST_DIR/$seq.fs

diff --git a/tests/xfs/252 b/tests/xfs/252
index b2c4c089d8acac350a308174bed64fb9a540ab1d..ddafda6f61c62583469c31c43303fad8aba7ca5f 100755 (executable)
--- a/tests/xfs/252
+++ b/tests/xfs/252
@@ -46,6 +46,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 _supported_fs xfs 
 _supported_os Linux
 
+_require_test
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "fiemap"
 

diff --git a/tests/xfs/253 b/tests/xfs/253
index 4119794286662d23d1e91c44d28facbb0dcaaa71..91eb0417baf2324d98e45b0803c32f432ea6a88c 100755 (executable)
--- a/tests/xfs/253
+++ b/tests/xfs/253
@@ -53,6 +53,7 @@ _cleanup()
 . ./common/rc
 . ./common/filter
 
+_require_test
 _require_scratch
 
 # real QA test starts here

diff --git a/tests/xfs/259 b/tests/xfs/259
index 8241d94dbb30276f3052ccb7aac5a387d16c1efa..6587a653bf7304b9efa7e87a1167a05f4ee4da30 100755 (executable)
--- a/tests/xfs/259
+++ b/tests/xfs/259
@@ -41,6 +41,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
+_require_test
 _require_loop
 _require_math
 

diff --git a/tests/xfs/290 b/tests/xfs/290
index 55322ec965ea3d79e44beabf8557c10a7c327cc1..adc398f0c04a9a109e0997c8b6cb66f0317ad349 100755 (executable)
--- a/tests/xfs/290
+++ b/tests/xfs/290
@@ -46,6 +46,7 @@ trap "exit \$status" 0 1 2 3 15
 _supported_fs xfs
 _supported_os Linux
 
+_require_test
 _require_xfs_io_command "zero"
 
 testfile=$TEST_DIR/290.$$

diff --git a/tests/xfs/292 b/tests/xfs/292
index b4a392f0fad4595da374d1237727b52ea8f1731b..a476d91a1b3e90433e2b8badeb2f85adf8328664 100755 (executable)
--- a/tests/xfs/292
+++ b/tests/xfs/292
@@ -46,6 +46,7 @@ _cleanup()
 # Modify as appropriate.
 _supported_fs xfs
 _supported_os IRIX Linux
+_require_test
 
 fsfile=$TEST_DIR/fsfile.$seq