From 2983eebf075fa0b1944207f7a4e644f8777dd8ee Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 20 Jul 2017 21:22:05 -0700 Subject: [PATCH] tests: remove IRIX support from tests also supported on Linux Many tests claimed (via _supported_os) to work on both Linux and IRIX. Since IRIX is no longer supported by xfstests, update these to claim Linux support only. Then remove any obvious IRIX-specific logic in the tests, and any IRIX-specific golden output files. Signed-off-by: Eric Biggers Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- lib/str_to_bytes.c | 2 +- ltp/rwtest.sh | 1 - src/fill2fs | 5 +- tests/generic/001 | 2 +- tests/generic/002 | 2 +- tests/generic/005 | 9 +- tests/generic/006 | 2 +- tests/generic/007 | 2 +- tests/generic/010 | 2 +- tests/generic/011 | 2 +- tests/generic/013 | 8 +- tests/generic/014 | 2 +- tests/generic/015 | 2 +- tests/generic/029 | 2 +- tests/generic/030 | 2 +- tests/generic/031 | 2 +- tests/generic/043 | 2 +- tests/generic/044 | 2 +- tests/generic/045 | 2 +- tests/generic/046 | 2 +- tests/generic/047 | 2 +- tests/generic/048 | 2 +- tests/generic/049 | 2 +- tests/generic/052 | 2 +- tests/generic/054 | 2 +- tests/generic/055 | 2 +- tests/generic/068 | 2 +- tests/generic/069 | 2 +- tests/generic/070 | 2 +- tests/generic/074 | 37 +- tests/generic/075 | 2 +- tests/generic/076 | 2 +- tests/generic/080 | 2 +- tests/generic/083 | 2 +- tests/generic/086 | 2 +- tests/generic/088 | 2 +- tests/generic/088.cfg | 1 - tests/generic/088.out.irix | 9 - tests/generic/096 | 2 +- tests/generic/100 | 2 +- tests/generic/105 | 11 +- tests/generic/117 | 2 +- tests/generic/120 | 2 +- tests/generic/123 | 2 +- tests/generic/130 | 2 +- tests/generic/132 | 2 +- tests/generic/133 | 2 +- tests/generic/135 | 2 +- tests/generic/184 | 2 +- tests/generic/219 | 2 +- tests/generic/226 | 2 +- tests/generic/230 | 2 +- tests/generic/234 | 2 +- tests/generic/235 | 2 +- tests/generic/273 | 2 +- tests/generic/274 | 2 +- tests/generic/275 | 2 +- tests/generic/309 | 2 +- tests/generic/313 | 2 +- tests/generic/320 | 2 +- tests/generic/378 | 2 +- tests/generic/379 | 2 +- tests/generic/380 | 2 +- tests/generic/384 | 8 +- tests/generic/403 | 2 +- tests/generic/416 | 2 +- tests/generic/424 | 2 +- tests/udf/102 | 2 +- tests/xfs/003 | 12 +- tests/xfs/004 | 6 +- tests/xfs/007 | 2 +- tests/xfs/008 | 2 +- tests/xfs/009 | 2 +- tests/xfs/012 | 2 +- tests/xfs/018 | 8 +- tests/xfs/018.cfg | 1 - tests/xfs/018.op.irix | 5628 ------------------------------------ tests/xfs/019 | 2 +- tests/xfs/022 | 5 +- tests/xfs/022.cfg | 1 - tests/xfs/022.out.irix | 55 - tests/xfs/023 | 2 +- tests/xfs/023.cfg | 1 - tests/xfs/023.out.irix | 89 - tests/xfs/026 | 2 +- tests/xfs/027 | 2 +- tests/xfs/028 | 2 +- tests/xfs/030 | 2 +- tests/xfs/030.cfg | 1 - tests/xfs/030.out.irix | 288 -- tests/xfs/031 | 2 +- tests/xfs/031.cfg | 1 - tests/xfs/031.out.irix | 123 - tests/xfs/032 | 2 +- tests/xfs/033 | 2 +- tests/xfs/033.cfg | 1 - tests/xfs/033.out.irix | 217 -- tests/xfs/035 | 2 +- tests/xfs/035.cfg | 1 - tests/xfs/035.out.irix | 94 - tests/xfs/036 | 2 +- tests/xfs/036.cfg | 1 - tests/xfs/036.out.irix | 86 - tests/xfs/039 | 2 +- tests/xfs/039.cfg | 1 - tests/xfs/039.out.irix | 89 - tests/xfs/041 | 2 +- tests/xfs/042 | 2 +- tests/xfs/043 | 2 +- tests/xfs/043.cfg | 1 - tests/xfs/043.out.irix | 104 - tests/xfs/046 | 2 +- tests/xfs/047 | 2 +- tests/xfs/048 | 2 +- tests/xfs/050 | 16 +- tests/xfs/052 | 2 +- tests/xfs/053 | 2 +- tests/xfs/055 | 2 +- tests/xfs/055.out.irix | 89 - tests/xfs/056 | 2 +- tests/xfs/061 | 2 +- tests/xfs/064 | 2 +- tests/xfs/065 | 2 +- tests/xfs/066 | 2 +- tests/xfs/071 | 2 +- tests/xfs/072 | 2 +- tests/xfs/080 | 6 - tests/xfs/081 | 10 +- tests/xfs/082 | 8 +- tests/xfs/082.cfg | 1 - tests/xfs/082.op.irix | 5628 ------------------------------------ tests/xfs/084 | 10 +- tests/xfs/092 | 2 +- tests/xfs/094 | 2 +- tests/xfs/096 | 2 +- tests/xfs/103 | 2 +- tests/xfs/107 | 2 +- tests/xfs/108 | 2 +- tests/xfs/116 | 2 +- tests/xfs/118 | 2 +- tests/xfs/119 | 2 +- tests/xfs/121 | 2 +- tests/xfs/136 | 2 +- tests/xfs/142 | 2 +- tests/xfs/143 | 2 +- tests/xfs/144 | 2 +- tests/xfs/145 | 2 +- tests/xfs/146 | 2 +- tests/xfs/146.cfg | 1 - tests/xfs/146.out.irix | 324 --- tests/xfs/147 | 2 +- tests/xfs/148 | 2 +- tests/xfs/149 | 2 +- tests/xfs/150 | 2 +- tests/xfs/151 | 2 +- tests/xfs/152 | 2 +- tests/xfs/153 | 2 +- tests/xfs/154 | 2 +- tests/xfs/155 | 2 +- tests/xfs/156 | 2 +- tests/xfs/157 | 2 +- tests/xfs/158 | 2 +- tests/xfs/159 | 2 +- tests/xfs/160 | 2 +- tests/xfs/161 | 2 +- tests/xfs/162 | 2 +- tests/xfs/163 | 2 +- tests/xfs/164 | 2 +- tests/xfs/165 | 2 +- tests/xfs/170 | 2 +- tests/xfs/172 | 2 +- tests/xfs/173 | 2 +- tests/xfs/174 | 2 +- tests/xfs/181 | 2 +- tests/xfs/185 | 2 +- tests/xfs/188 | 2 +- tests/xfs/194 | 2 +- tests/xfs/206 | 2 +- tests/xfs/291 | 2 +- tests/xfs/292 | 2 +- tests/xfs/293 | 2 +- tests/xfs/295 | 2 +- tests/xfs/297 | 2 +- tests/xfs/303 | 2 +- 184 files changed, 175 insertions(+), 13103 deletions(-) delete mode 100644 tests/generic/088.out.irix delete mode 100644 tests/xfs/018.op.irix delete mode 100644 tests/xfs/022.out.irix delete mode 100644 tests/xfs/023.out.irix delete mode 100644 tests/xfs/030.out.irix delete mode 100644 tests/xfs/031.out.irix delete mode 100644 tests/xfs/033.out.irix delete mode 100644 tests/xfs/035.out.irix delete mode 100644 tests/xfs/036.out.irix delete mode 100644 tests/xfs/039.out.irix delete mode 100644 tests/xfs/043.out.irix delete mode 100644 tests/xfs/055.out.irix delete mode 100644 tests/xfs/082.op.irix delete mode 100644 tests/xfs/146.out.irix diff --git a/lib/str_to_bytes.c b/lib/str_to_bytes.c index c0d7d974..ef5d4fd9 100644 --- a/lib/str_to_bytes.c +++ b/lib/str_to_bytes.c @@ -124,7 +124,7 @@ char *s; } /* - * Force 64 bits number when compiled as 32 IRIX binary. + * Force 64 bits number when compiled as a 32-bit binary. * This allows for a number bigger than 2G. */ diff --git a/ltp/rwtest.sh b/ltp/rwtest.sh index da42caa1..a001c571 100755 --- a/ltp/rwtest.sh +++ b/ltp/rwtest.sh @@ -252,7 +252,6 @@ fi # case $(uname -s) in - IRIX | IRIX64 ) dfOpts="-Pb" ;; Linux) dfOpts="-P" ;; *) dfOpts="-PB" ;; esac diff --git a/src/fill2fs b/src/fill2fs index 60d52be3..1c3383a8 100755 --- a/src/fill2fs +++ b/src/fill2fs @@ -37,8 +37,6 @@ use Getopt::Long; use File::Basename; -chomp($os = `uname`); - # # fsinfo: get filesystem info put it into the global namespace, initialises: # $dev, $type, $blocks, $used, $avail, $cap, $mnt, $mnt_options @@ -53,8 +51,7 @@ sub fsinfo { # filesystem space and mount point - $cmd = "df" if ($os =~ /IRIX/); - $cmd = "df -P -T --block-size=512" if ($os =~ /Linux/); + $cmd = "df -P -T --block-size=512"; chomp($_ = `$cmd $file | tail -1`); $n = ($dev, $type, $blocks, $used, $avail, $cap, $mnt) = split(/ +/); die("df failed") if ($n != 7); diff --git a/tests/generic/001 b/tests/generic/001 index e977a018..0edd41f1 100755 --- a/tests/generic/001 +++ b/tests/generic/001 @@ -47,7 +47,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 +_supported_os Linux _require_test verbose=true diff --git a/tests/generic/002 b/tests/generic/002 index 0433882d..d8cffeaa 100755 --- a/tests/generic/002 +++ b/tests/generic/002 @@ -42,7 +42,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test rm -f $seqres.full diff --git a/tests/generic/005 b/tests/generic/005 index 70f60738..030d90b1 100755 --- a/tests/generic/005 +++ b/tests/generic/005 @@ -23,9 +23,8 @@ # # -# Note1: On Linux, ELOOP limit used to be 32 but changed to 8, and lately +# Note: On Linux, ELOOP limit used to be 32 but changed to 8, and lately # its become 5. Who knows what it might be next. -# Note2: On IRIX, the limit is around the 30 mark. # # What we are looking for here is: no panic due to blowing the stack; # and that the ELOOP error code is returned at some point (the actual @@ -50,9 +49,7 @@ _cleanup() _touch() { - # On IRIX: Too many symbolic links in path name traversal - # On Linux: Too many levels of symbolic links - touch $@ 2>&1 | grep -q 'Too many.*symbolic links' + touch $@ 2>&1 | grep -q 'Too many levels of symbolic links' if [ $? -eq 0 ]; then echo "ELOOP returned. Good." else @@ -69,7 +66,7 @@ _supported_fs generic _require_test _require_test_symlinks -_supported_os Linux IRIX +_supported_os Linux cd $TEST_DIR diff --git a/tests/generic/006 b/tests/generic/006 index 7a38dbfa..7309f1f3 100755 --- a/tests/generic/006 +++ b/tests/generic/006 @@ -53,7 +53,7 @@ _count() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test mkdir $TEST_DIR/permname.$$ diff --git a/tests/generic/007 b/tests/generic/007 index cfa45541..327bbe9c 100755 --- a/tests/generic/007 +++ b/tests/generic/007 @@ -47,7 +47,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test status=1 # default failure diff --git a/tests/generic/010 b/tests/generic/010 index 1c9d8f7e..d23a58b1 100755 --- a/tests/generic/010 +++ b/tests/generic/010 @@ -55,7 +55,7 @@ _require_test_program "dbtest" # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test rm -f $seqres.full diff --git a/tests/generic/011 b/tests/generic/011 index f3c2f7cf..7c4b80c3 100755 --- a/tests/generic/011 +++ b/tests/generic/011 @@ -45,7 +45,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test out=$TEST_DIR/dirstress.$$ diff --git a/tests/generic/013 b/tests/generic/013 index e31fe354..d1ba697b 100755 --- a/tests/generic/013 +++ b/tests/generic/013 @@ -37,11 +37,7 @@ _cleanup() # we might get here with a RO FS _test_cycle_mount # now remove fsstress directory. - # N.B. rm(1) on IRIX can find problems when building up a long pathname - # such that what it has is greater the 1024 chars and will - # stop and complain - so get rid of complaint - # Ref. pv#935754 - rm -rf $TEST_DIR/fsstress.$$.* 2>&1 | grep -v 'Path too long' + rm -rf $TEST_DIR/fsstress.$$.* } _filesize() @@ -90,7 +86,7 @@ _do_test() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test rm -f $seqres.full diff --git a/tests/generic/014 b/tests/generic/014 index d2dcc282..28566956 100755 --- a/tests/generic/014 +++ b/tests/generic/014 @@ -43,7 +43,7 @@ _cleanup() . ./common/filter _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test _require_sparse_files diff --git a/tests/generic/015 b/tests/generic/015 index 66c33c22..78f2b13d 100755 --- a/tests/generic/015 +++ b/tests/generic/015 @@ -48,7 +48,7 @@ _free() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch _require_no_large_scratch_dev diff --git a/tests/generic/029 b/tests/generic/029 index a83d02d3..c2f02fb9 100755 --- a/tests/generic/029 +++ b/tests/generic/029 @@ -46,7 +46,7 @@ _cleanup() # Modify as appropriate. _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch testfile=$SCRATCH_MNT/testfile diff --git a/tests/generic/030 b/tests/generic/030 index 8e6827db..8b7e6fba 100755 --- a/tests/generic/030 +++ b/tests/generic/030 @@ -46,7 +46,7 @@ _cleanup() # Modify as appropriate. _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch _require_xfs_io_command "mremap" diff --git a/tests/generic/031 b/tests/generic/031 index fcb5f89b..3f25f8b8 100755 --- a/tests/generic/031 +++ b/tests/generic/031 @@ -46,7 +46,7 @@ _cleanup() # Modify as appropriate. _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch _require_xfs_io_command "fcollapse" diff --git a/tests/generic/043 b/tests/generic/043 index 784683eb..5dadab32 100755 --- a/tests/generic/043 +++ b/tests/generic/043 @@ -37,7 +37,7 @@ trap "exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_scratch _require_scratch_shutdown diff --git a/tests/generic/044 b/tests/generic/044 index f0dc0df1..804b1b17 100755 --- a/tests/generic/044 +++ b/tests/generic/044 @@ -37,7 +37,7 @@ trap "exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_scratch _require_scratch_shutdown diff --git a/tests/generic/045 b/tests/generic/045 index b49d09e3..5fa7b09f 100755 --- a/tests/generic/045 +++ b/tests/generic/045 @@ -37,7 +37,7 @@ trap "exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_scratch _require_scratch_shutdown diff --git a/tests/generic/046 b/tests/generic/046 index 54cb557b..bf38d53a 100755 --- a/tests/generic/046 +++ b/tests/generic/046 @@ -37,7 +37,7 @@ trap "exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_scratch _require_scratch_shutdown diff --git a/tests/generic/047 b/tests/generic/047 index 20f157e5..7d09b04c 100755 --- a/tests/generic/047 +++ b/tests/generic/047 @@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_scratch _require_scratch_shutdown diff --git a/tests/generic/048 b/tests/generic/048 index dc2ab204..ae561fca 100755 --- a/tests/generic/048 +++ b/tests/generic/048 @@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_scratch _require_scratch_shutdown diff --git a/tests/generic/049 b/tests/generic/049 index c7f19446..ef2b44c4 100755 --- a/tests/generic/049 +++ b/tests/generic/049 @@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_scratch _require_scratch_shutdown diff --git a/tests/generic/052 b/tests/generic/052 index 65d430d1..cf0f4568 100755 --- a/tests/generic/052 +++ b/tests/generic/052 @@ -41,7 +41,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux rm -f $seqres.full rm -f $tmp.log diff --git a/tests/generic/054 b/tests/generic/054 index 4d4be59b..db415009 100755 --- a/tests/generic/054 +++ b/tests/generic/054 @@ -40,7 +40,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux rm -f $seqres.full $tmp.* _require_scratch diff --git a/tests/generic/055 b/tests/generic/055 index aed3b28c..1bbe3108 100755 --- a/tests/generic/055 +++ b/tests/generic/055 @@ -67,7 +67,7 @@ _get_quota_option() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux rm -f $seqres.full $tmp.* _require_scratch diff --git a/tests/generic/068 b/tests/generic/068 index f9f5f5aa..bd12278c 100755 --- a/tests/generic/068 +++ b/tests/generic/068 @@ -49,7 +49,7 @@ trap "_cleanup" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_scratch _require_freeze diff --git a/tests/generic/069 b/tests/generic/069 index aaf6bbf5..15586e9b 100755 --- a/tests/generic/069 +++ b/tests/generic/069 @@ -37,7 +37,7 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch rm -f $seqres.full diff --git a/tests/generic/070 b/tests/generic/070 index 7591b25c..de0c45c7 100755 --- a/tests/generic/070 +++ b/tests/generic/070 @@ -45,7 +45,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test _require_attrs diff --git a/tests/generic/074 b/tests/generic/074 index 737b49bf..5f205b50 100755 --- a/tests/generic/074 +++ b/tests/generic/074 @@ -42,7 +42,7 @@ _cleanup() . ./common/filter _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test rm -f $seqres.full @@ -116,37 +116,16 @@ _process_args() # These params can take a while on different CPUs/OSs # so we set them differently for different machines # -if [ $HOSTOS == "IRIX" ]; then - if uname -R | grep -iq debug; then - # e.g. getting around 37secs for 1,1,1 on IP30 debug - numchildren=2 - numloops=1 - numfiles=2 - param_type="IRIX debug" - else - # getting around 1 sec 1,1,1 - 10secs 1,10,1 on IP30 nondebug +if uname -a | grep -q SMP; then + numloops=10 + numfiles=5 + numchildren=3 + param_type="Linux SMP" +else numloops=2 numfiles=3 numchildren=3 - param_type="IRIX nondebug" - fi -elif [ $HOSTOS == "Linux" ]; then - if uname -a | grep -q SMP; then - numloops=10 - numfiles=5 - numchildren=3 - param_type="Linux SMP" - else - numloops=2 - numfiles=3 - numchildren=3 - param_type="Linux UP" - fi -else - numloops=1 - numfiles=1 - numchildren=1 - param_type="Default" + param_type="Linux UP" fi # can override the params here diff --git a/tests/generic/075 b/tests/generic/075 index 6a214bc3..321c7217 100755 --- a/tests/generic/075 +++ b/tests/generic/075 @@ -124,7 +124,7 @@ _process_args() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test size10=`expr 10 \* 1024 \* 1024` # 10 megabytes diff --git a/tests/generic/076 b/tests/generic/076 index a29f160a..ac765333 100755 --- a/tests/generic/076 +++ b/tests/generic/076 @@ -53,7 +53,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 +_supported_os Linux _require_scratch _require_local_device $SCRATCH_DEV diff --git a/tests/generic/080 b/tests/generic/080 index 43c93d73..a4c111b9 100755 --- a/tests/generic/080 +++ b/tests/generic/080 @@ -41,7 +41,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test echo "Silence is golden." diff --git a/tests/generic/083 b/tests/generic/083 index 2f8c4a0d..9f09a7b0 100755 --- a/tests/generic/083 +++ b/tests/generic/083 @@ -53,7 +53,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch _require_no_large_scratch_dev diff --git a/tests/generic/086 b/tests/generic/086 index 5eeee50e..9c92c9bd 100755 --- a/tests/generic/086 +++ b/tests/generic/086 @@ -51,7 +51,7 @@ _cleanup() # Modify as appropriate. _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test _require_xfs_io_command "falloc" diff --git a/tests/generic/088 b/tests/generic/088 index 46ce6ae4..1f01c4f5 100755 --- a/tests/generic/088 +++ b/tests/generic/088 @@ -47,7 +47,7 @@ _link_out_file # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test path=$TEST_DIR/t_access diff --git a/tests/generic/088.cfg b/tests/generic/088.cfg index 7ffdfc07..7fd51a7d 100644 --- a/tests/generic/088.cfg +++ b/tests/generic/088.cfg @@ -1,2 +1 @@ -irix: irix linux: linux diff --git a/tests/generic/088.out.irix b/tests/generic/088.out.irix deleted file mode 100644 index f31ecf90..00000000 --- a/tests/generic/088.out.irix +++ /dev/null @@ -1,9 +0,0 @@ -QA output created by 088 -access(TEST_DIR/t_access, 0) returns 0 -access(TEST_DIR/t_access, R_OK) returns 0 -access(TEST_DIR/t_access, W_OK) returns 0 -access(TEST_DIR/t_access, X_OK) returns 0 -access(TEST_DIR/t_access, R_OK | W_OK) returns 0 -access(TEST_DIR/t_access, R_OK | X_OK) returns 0 -access(TEST_DIR/t_access, W_OK | X_OK) returns 0 -access(TEST_DIR/t_access, R_OK | W_OK | X_OK) returns 0 diff --git a/tests/generic/096 b/tests/generic/096 index daf9981a..bfdb93a1 100755 --- a/tests/generic/096 +++ b/tests/generic/096 @@ -45,7 +45,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch _require_xfs_io_command "fzero" diff --git a/tests/generic/100 b/tests/generic/100 index e5e819dc..8aff7b44 100755 --- a/tests/generic/100 +++ b/tests/generic/100 @@ -43,7 +43,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test # Use _populate_fs() in common/rc to create a directory structure. diff --git a/tests/generic/105 b/tests/generic/105 index 9b7beb4d..8b6aa526 100755 --- a/tests/generic/105 +++ b/tests/generic/105 @@ -46,7 +46,7 @@ _cleanup() # Modify as appropriate. _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux # real QA test starts here @@ -78,14 +78,7 @@ echo data > subdir/file _ls_l subdir/file | awk '{ print $1, $3 }' # add an ACL with a user ACE which has no exec permission -if [ "$HOSTOS" == "Linux" ]; then - setfacl -m u:$acl1:r subdir -elif [ "$HOSTOS" == "IRIX" ]; then - chacl u:$acl:r--,g::---,o::--- subdir -else - echo "Unknown OS!" - exit 1 -fi +setfacl -m u:$acl1:r subdir # With the bug this gives: `ls: subdir/file: Permission denied' # because one needs at least an exec perm somewhere in acl diff --git a/tests/generic/117 b/tests/generic/117 index b634861d..58165eaa 100755 --- a/tests/generic/117 +++ b/tests/generic/117 @@ -76,7 +76,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch _require_attrs diff --git a/tests/generic/120 b/tests/generic/120 index 9cf4ea8d..7d65f620 100755 --- a/tests/generic/120 +++ b/tests/generic/120 @@ -37,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_scratch _require_atime diff --git a/tests/generic/123 b/tests/generic/123 index 453ede4b..e0948dff 100755 --- a/tests/generic/123 +++ b/tests/generic/123 @@ -46,7 +46,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_test _require_user diff --git a/tests/generic/130 b/tests/generic/130 index 1e96630e..90bd1693 100755 --- a/tests/generic/130 +++ b/tests/generic/130 @@ -46,7 +46,7 @@ trap "exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_scratch _require_sparse_files diff --git a/tests/generic/132 b/tests/generic/132 index aa52c7db..24e568b2 100755 --- a/tests/generic/132 +++ b/tests/generic/132 @@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_scratch diff --git a/tests/generic/133 b/tests/generic/133 index f1a221e0..37a86e83 100755 --- a/tests/generic/133 +++ b/tests/generic/133 @@ -37,7 +37,7 @@ trap "exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_test _require_odirect diff --git a/tests/generic/135 b/tests/generic/135 index 14b81321..52c1227b 100755 --- a/tests/generic/135 +++ b/tests/generic/135 @@ -37,7 +37,7 @@ trap "exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_odirect _require_scratch diff --git a/tests/generic/184 b/tests/generic/184 index d7c0eb9a..5690cd18 100755 --- a/tests/generic/184 +++ b/tests/generic/184 @@ -43,7 +43,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test rm -f $TEST_DIR/null diff --git a/tests/generic/219 b/tests/generic/219 index bdeb0334..9a8d017e 100755 --- a/tests/generic/219 +++ b/tests/generic/219 @@ -41,7 +41,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux #IRIX +_supported_os Linux _require_scratch _require_quota _require_user diff --git a/tests/generic/226 b/tests/generic/226 index a099ec6d..cf6913ee 100755 --- a/tests/generic/226 +++ b/tests/generic/226 @@ -35,7 +35,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 . ./common/rc _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_scratch _require_odirect diff --git a/tests/generic/230 b/tests/generic/230 index 28ca87da..0d2b2794 100755 --- a/tests/generic/230 +++ b/tests/generic/230 @@ -41,7 +41,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux #IRIX +_supported_os Linux _require_scratch _require_quota _require_user diff --git a/tests/generic/234 b/tests/generic/234 index 75a2c23c..4605072e 100755 --- a/tests/generic/234 +++ b/tests/generic/234 @@ -88,7 +88,7 @@ test_setting() # real QA test starts here _supported_fs generic -_supported_os Linux #IRIX +_supported_os Linux _require_scratch _require_quota diff --git a/tests/generic/235 b/tests/generic/235 index 309540ac..f991b1b7 100755 --- a/tests/generic/235 +++ b/tests/generic/235 @@ -41,7 +41,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux #IRIX +_supported_os Linux _require_scratch _require_quota _require_user diff --git a/tests/generic/273 b/tests/generic/273 index 578b1dab..de787e7a 100755 --- a/tests/generic/273 +++ b/tests/generic/273 @@ -125,7 +125,7 @@ _do_workload() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch echo "------------------------------" diff --git a/tests/generic/274 b/tests/generic/274 index 61ab2209..7d093865 100755 --- a/tests/generic/274 +++ b/tests/generic/274 @@ -46,7 +46,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch _require_xfs_io_command "falloc" diff --git a/tests/generic/275 b/tests/generic/275 index 955c4aca..4129cfcf 100755 --- a/tests/generic/275 +++ b/tests/generic/275 @@ -44,7 +44,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch echo "------------------------------" diff --git a/tests/generic/309 b/tests/generic/309 index c6b89db9..9dee88c7 100755 --- a/tests/generic/309 +++ b/tests/generic/309 @@ -45,7 +45,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test echo "Silence is golden" diff --git a/tests/generic/313 b/tests/generic/313 index a9069260..5a3cb859 100755 --- a/tests/generic/313 +++ b/tests/generic/313 @@ -44,7 +44,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test testfile=$TEST_DIR/testfile.$seq diff --git a/tests/generic/320 b/tests/generic/320 index 3dd3bead..83ad21f4 100755 --- a/tests/generic/320 +++ b/tests/generic/320 @@ -49,7 +49,7 @@ _cleanup() # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch threads=100 diff --git a/tests/generic/378 b/tests/generic/378 index 8139b4d5..7f4d3061 100755 --- a/tests/generic/378 +++ b/tests/generic/378 @@ -51,7 +51,7 @@ rm -f $seqres.full # real QA test starts here _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test _require_user diff --git a/tests/generic/379 b/tests/generic/379 index fb7420b0..408ade56 100755 --- a/tests/generic/379 +++ b/tests/generic/379 @@ -45,7 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux cp /dev/null $seqres.full chmod ugo+rwx $seqres.full diff --git a/tests/generic/380 b/tests/generic/380 index 2a6dbb78..7d2e1d2b 100755 --- a/tests/generic/380 +++ b/tests/generic/380 @@ -48,7 +48,7 @@ _cleanup() # Modify as appropriate. _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch _require_quota diff --git a/tests/generic/384 b/tests/generic/384 index 452d26e3..fd162b60 100755 --- a/tests/generic/384 +++ b/tests/generic/384 @@ -46,7 +46,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs generic -_supported_os Linux IRIX +_supported_os Linux _require_test _require_quota @@ -97,11 +97,7 @@ touch $dir/2 cp $dir/2 $dir/3 report_quota -if [ "$HOSTOS" == "IRIX" ] ; then - mkfile 1M $TEST_DIR/6 -else - xfs_mkfile 1M $TEST_DIR/6 -fi +xfs_mkfile 1M $TEST_DIR/6 #try cp to dir cp $TEST_DIR/6 $dir/6 diff --git a/tests/generic/403 b/tests/generic/403 index 81d36608..17897ffb 100755 --- a/tests/generic/403 +++ b/tests/generic/403 @@ -49,7 +49,7 @@ rm -f $seqres.full # Modify as appropriate. _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch _require_attrs diff --git a/tests/generic/416 b/tests/generic/416 index 925524b8..7c6ced75 100755 --- a/tests/generic/416 +++ b/tests/generic/416 @@ -50,7 +50,7 @@ rm -f $seqres.full # Modify as appropriate. _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_scratch fs_size=$((128 * 1024 * 1024)) diff --git a/tests/generic/424 b/tests/generic/424 index 1810e850..3653a31b 100755 --- a/tests/generic/424 +++ b/tests/generic/424 @@ -50,7 +50,7 @@ rm -f $seqres.full # Modify as appropriate. _supported_fs generic -_supported_os IRIX Linux +_supported_os Linux _require_test _require_test_program stat_test _require_statx diff --git a/tests/udf/102 b/tests/udf/102 index 8fd46976..dd644c01 100755 --- a/tests/udf/102 +++ b/tests/udf/102 @@ -43,7 +43,7 @@ _cleanup() # real QA test starts here _supported_fs udf -_supported_os Linux IRIX +_supported_os Linux _require_scratch _setup_udf_scratchdir diff --git a/tests/xfs/003 b/tests/xfs/003 index 0fd4cfa0..3cc52423 100755 --- a/tests/xfs/003 +++ b/tests/xfs/003 @@ -37,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs xfs -_supported_os IRIX Linux +_supported_os Linux _require_test [ -f core ] && rm -f core @@ -72,14 +72,8 @@ test_done echo "=== TEST 5 ===" xfs_db -r -c 'inode 128' -c 'push' -c 'type' $TEST_DEV >$tmp.out 2>&1 test_done -# On IRIX we lose state after a "push" operation and don't -# know the type is still inode -# Probably not worth changing xfs_db on IRIX for this. -if [ "$HOSTOS" != "IRIX" ]; then - if ! grep -q "current type is \"inode\"" $tmp.out - then - cat $tmp.out - fi +if ! grep -q "current type is \"inode\"" $tmp.out; then + cat $tmp.out fi echo "=== TEST 6 ===" diff --git a/tests/xfs/004 b/tests/xfs/004 index f27f4b79..f06c4f0f 100755 --- a/tests/xfs/004 +++ b/tests/xfs/004 @@ -58,7 +58,7 @@ _populate_scratch() # real QA test starts here _supported_fs xfs -_supported_os IRIX Linux +_supported_os Linux _require_scratch _require_no_large_scratch_dev @@ -67,9 +67,7 @@ rm -f $seqres.full _populate_scratch -[ "$HOSTOS" = "Linux" ] && DF_PROG="$DF_PROG -P --block-size=512" - -eval `$DF_PROG $SCRATCH_MNT 2>&1 \ +eval `$DF_PROG -P --block-size=512 $SCRATCH_MNT 2>&1 \ | tail -1 | $AWK_PROG '{ printf "blocks=%u used=%u avail=%u\n", $3, $4, $5 }'` echo "df gave: blocks=$blocks used=$used avail=$avail" >>$seqres.full echo "blocksize from mkfs is '$dbsize'" >>$seqres.full diff --git a/tests/xfs/007 b/tests/xfs/007 index 92ec915f..d80d380f 100755 --- a/tests/xfs/007 +++ b/tests/xfs/007 @@ -43,7 +43,7 @@ _cleanup() # Modify as appropriate. _supported_fs xfs -_supported_os Linux Irix +_supported_os Linux _require_scratch _require_xfs_quota diff --git a/tests/xfs/008 b/tests/xfs/008 index 9f22087d..d38d320f 100755 --- a/tests/xfs/008 +++ b/tests/xfs/008 @@ -86,7 +86,7 @@ _do_test() # real QA test starts here _supported_fs xfs -_supported_os IRIX Linux +_supported_os Linux _require_test rm -f $seqres.full diff --git a/tests/xfs/009 b/tests/xfs/009 index abef2e05..1a5bd4d3 100755 --- a/tests/xfs/009 +++ b/tests/xfs/009 @@ -76,7 +76,7 @@ _filesize() # real QA test starts here _supported_fs xfs -_supported_os IRIX Linux +_supported_os Linux _require_scratch diff --git a/tests/xfs/012 b/tests/xfs/012 index 7b9a54d2..e2c810dd 100755 --- a/tests/xfs/012 +++ b/tests/xfs/012 @@ -103,7 +103,7 @@ _do_test() # real QA test starts here _supported_fs xfs -_supported_os IRIX Linux +_supported_os Linux _require_test rm -f $seqres.full diff --git a/tests/xfs/018 b/tests/xfs/018 index 451735fd..253af940 100755 --- a/tests/xfs/018 +++ b/tests/xfs/018 @@ -47,7 +47,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # real QA test starts here _supported_fs xfs -_supported_os IRIX Linux +_supported_os Linux # prelim rm -f $seqres.full $tmp.* _require_scratch @@ -68,11 +68,7 @@ cat >$tmp.seq.params < - log device: daddr: length: -Oper (OPNUM): tid: len: clientid: TRANS flags: START -Oper (OPNUM): tid: len: clientid: TRANS flags: none -TRAN: type: CREATE (0x4) tid: num_items: 5 -Oper (OPNUM): tid: len: clientid: TRANS flags: none -BUF: #regs:R start blkno: () len: bmap size: 1 -Oper (OPNUM): tid: len: clientid: TRANS flags: none -AGI Buffer: XAGI -ver: 1 seq#: 0 len: cnt: 64 root: 3 -level: 1 free#: 0x3c newino: -bucket[0 - 3]: 0xffffffff 0xffffffff 0xffffffff 0xffffffff -bucket[4 - 7]: 0xffffffff 0xffffffff 0xffffffff 0xffffffff -bucket[8 - 11]: 0xffffffff 0xffffffff 0xffffffff 0xffffffff -bucket[12 - 15]: 0xffffffff 0xffffffff 0xffffffff 0xffffffff -bucket[16 - 19]: 0xffffffff -Oper (OPNUM): tid: len: clientid: TRANS flags: none -BUF: #regs:R start blkno: () len: bmap size: 2 -Oper (OPNUM): tid: len: clientid: TRANS flags: none -BUF DATA -Oper (OPNUM): tid: len: clientid: TRANS flags: none -INODE: #regs:R ino: flags: 0x1 dsize: 0 - blkno: len: boff: -Oper (OPNUM): tid: len: clientid: TRANS flags: none -INODE CORE -magic 0x494e mode 0100644 version 1 format 2 -nlink 1 uid 0 gid 0 -atime