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 <ebiggers@google.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Eric Biggers
2017-07-20 21:22:05 -07:00
committed by Eryu Guan
parent 0e3b0ab584
commit 2983eebf07
184 changed files with 175 additions and 13103 deletions
+1 -1
View File
@@ -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. * This allows for a number bigger than 2G.
*/ */
-1
View File
@@ -252,7 +252,6 @@ fi
# #
case $(uname -s) in case $(uname -s) in
IRIX | IRIX64 ) dfOpts="-Pb" ;;
Linux) dfOpts="-P" ;; Linux) dfOpts="-P" ;;
*) dfOpts="-PB" ;; *) dfOpts="-PB" ;;
esac esac
+1 -4
View File
@@ -37,8 +37,6 @@
use Getopt::Long; use Getopt::Long;
use File::Basename; use File::Basename;
chomp($os = `uname`);
# #
# fsinfo: get filesystem info put it into the global namespace, initialises: # fsinfo: get filesystem info put it into the global namespace, initialises:
# $dev, $type, $blocks, $used, $avail, $cap, $mnt, $mnt_options # $dev, $type, $blocks, $used, $avail, $cap, $mnt, $mnt_options
@@ -53,8 +51,7 @@ sub fsinfo {
# filesystem space and mount point # filesystem space and mount point
$cmd = "df" if ($os =~ /IRIX/); $cmd = "df -P -T --block-size=512";
$cmd = "df -P -T --block-size=512" if ($os =~ /Linux/);
chomp($_ = `$cmd $file | tail -1`); chomp($_ = `$cmd $file | tail -1`);
$n = ($dev, $type, $blocks, $used, $avail, $cap, $mnt) = split(/ +/); $n = ($dev, $type, $blocks, $used, $avail, $cap, $mnt) = split(/ +/);
die("df failed") if ($n != 7); die("df failed") if ($n != 7);
+1 -1
View File
@@ -47,7 +47,7 @@ trap "_cleanup; rm -f $tmp.*; exit \$status" 0 1 2 3 15
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os IRIX Linux _supported_os Linux
_require_test _require_test
verbose=true verbose=true
+1 -1
View File
@@ -42,7 +42,7 @@ _cleanup()
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os IRIX Linux _supported_os Linux
_require_test _require_test
rm -f $seqres.full rm -f $seqres.full
+3 -6
View File
@@ -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. # 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; # 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 # and that the ELOOP error code is returned at some point (the actual
@@ -50,9 +49,7 @@ _cleanup()
_touch() _touch()
{ {
# On IRIX: Too many symbolic links in path name traversal touch $@ 2>&1 | grep -q 'Too many levels of symbolic links'
# On Linux: Too many levels of symbolic links
touch $@ 2>&1 | grep -q 'Too many.*symbolic links'
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "ELOOP returned. Good." echo "ELOOP returned. Good."
else else
@@ -69,7 +66,7 @@ _supported_fs generic
_require_test _require_test
_require_test_symlinks _require_test_symlinks
_supported_os Linux IRIX _supported_os Linux
cd $TEST_DIR cd $TEST_DIR
+1 -1
View File
@@ -53,7 +53,7 @@ _count()
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os IRIX Linux _supported_os Linux
_require_test _require_test
mkdir $TEST_DIR/permname.$$ mkdir $TEST_DIR/permname.$$
+1 -1
View File
@@ -47,7 +47,7 @@ _cleanup()
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os IRIX Linux _supported_os Linux
_require_test _require_test
status=1 # default failure status=1 # default failure
+1 -1
View File
@@ -55,7 +55,7 @@ _require_test_program "dbtest"
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os IRIX Linux _supported_os Linux
_require_test _require_test
rm -f $seqres.full rm -f $seqres.full
+1 -1
View File
@@ -45,7 +45,7 @@ _cleanup()
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os IRIX Linux _supported_os Linux
_require_test _require_test
out=$TEST_DIR/dirstress.$$ out=$TEST_DIR/dirstress.$$
+2 -6
View File
@@ -37,11 +37,7 @@ _cleanup()
# we might get here with a RO FS # we might get here with a RO FS
_test_cycle_mount _test_cycle_mount
# now remove fsstress directory. # now remove fsstress directory.
# N.B. rm(1) on IRIX can find problems when building up a long pathname rm -rf $TEST_DIR/fsstress.$$.*
# 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'
} }
_filesize() _filesize()
@@ -90,7 +86,7 @@ _do_test()
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os IRIX Linux _supported_os Linux
_require_test _require_test
rm -f $seqres.full rm -f $seqres.full
+1 -1
View File
@@ -43,7 +43,7 @@ _cleanup()
. ./common/filter . ./common/filter
_supported_fs generic _supported_fs generic
_supported_os IRIX Linux _supported_os Linux
_require_test _require_test
_require_sparse_files _require_sparse_files
+1 -1
View File
@@ -48,7 +48,7 @@ _free()
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os IRIX Linux _supported_os Linux
_require_scratch _require_scratch
_require_no_large_scratch_dev _require_no_large_scratch_dev
+1 -1
View File
@@ -46,7 +46,7 @@ _cleanup()
# Modify as appropriate. # Modify as appropriate.
_supported_fs generic _supported_fs generic
_supported_os IRIX Linux _supported_os Linux
_require_scratch _require_scratch
testfile=$SCRATCH_MNT/testfile testfile=$SCRATCH_MNT/testfile
+1 -1
View File
@@ -46,7 +46,7 @@ _cleanup()
# Modify as appropriate. # Modify as appropriate.
_supported_fs generic _supported_fs generic
_supported_os IRIX Linux _supported_os Linux
_require_scratch _require_scratch
_require_xfs_io_command "mremap" _require_xfs_io_command "mremap"
+1 -1
View File
@@ -46,7 +46,7 @@ _cleanup()
# Modify as appropriate. # Modify as appropriate.
_supported_fs generic _supported_fs generic
_supported_os IRIX Linux _supported_os Linux
_require_scratch _require_scratch
_require_xfs_io_command "fcollapse" _require_xfs_io_command "fcollapse"
+1 -1
View File
@@ -37,7 +37,7 @@ trap "exit \$status" 0 1 2 3 15
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os Linux IRIX _supported_os Linux
_require_scratch _require_scratch
_require_scratch_shutdown _require_scratch_shutdown
+1 -1
View File
@@ -37,7 +37,7 @@ trap "exit \$status" 0 1 2 3 15
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os Linux IRIX _supported_os Linux
_require_scratch _require_scratch
_require_scratch_shutdown _require_scratch_shutdown
+1 -1
View File
@@ -37,7 +37,7 @@ trap "exit \$status" 0 1 2 3 15
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os Linux IRIX _supported_os Linux
_require_scratch _require_scratch
_require_scratch_shutdown _require_scratch_shutdown
+1 -1
View File
@@ -37,7 +37,7 @@ trap "exit \$status" 0 1 2 3 15
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os Linux IRIX _supported_os Linux
_require_scratch _require_scratch
_require_scratch_shutdown _require_scratch_shutdown

Some files were not shown because too many files have changed in this diff Show More