xfstests: remove IRIX support

150 lines not on this page · raw message

index 0113a48ca00c2637080cbaa3bcf9bb5cc90dd473..cb29153ebfb94b066e2c1c77eebb4a1c097dbd0d 100644
GIT binary patch

index e626820c..d93aa06d 100644
@@ -95,7 +95,7 @@
 090 metadata auto quick
 091 rw auto quick
 092 auto quick prealloc
-093 attr cap udf auto
+093 attr cap auto
 094 auto quick prealloc
 095 auto rw stress
 096 auto prealloc quick zero

index 1e994889..c0736486 100644
@@ -235,7 +235,6 @@
 
 # Symlinked files
 /tests/generic/088.out
-/tests/generic/097.out
 /tests/xfs/018.op
 /tests/xfs/022.out
 /tests/xfs/023.out

337 lines not on this page · raw message

177 lines not on this page · raw message

deleted file mode 100644
index 1d36ff76..00000000

deleted file mode 100644
index 0024bf23..00000000

index d93aa06d..20c278cc 100644
@@ -99,7 +99,7 @@
 094 auto quick prealloc
 095 auto rw stress
 096 auto prealloc quick zero
-097 udf auto
+097 attr auto quick
 098 auto quick metadata
 099 udf auto
 100 udf auto

index d1373586..1f5a51f6 100755
@@ -1,7 +1,7 @@
 #! /bin/bash
 # FS QA Test No. 095
 #
-# test out xfs_chver on IRIX
+# Test upgrading the XFS log to v2
 #
 #-----------------------------------------------------------------------
 # Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.

@@ -46,7 +46,7 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX
+_supported_os Linux
 _require_scratch
 _require_v2log
 

@@ -54,14 +54,13 @@ export MOUNT_OPTIONS="-o logbsize=64k"
 
 # try and mount a v1 log with a v2 LRsize
 # expect failure
-_mkfs_log "-l version=1"
+_mkfs_log "-l version=1 -m crc=0 -d sectsize=512"
+_scratch_xfs_db -c 'version' | tr ',' '\n' | grep LOGV2
 _create_log
 
 # now make the fs a v2 fs and try to mount again
 # it should succeed this time
-xfs_chver -l 2 $SCRATCH_DEV | \
-sed -e "s#$SCRATCH_DEV#SCRATCH_DEV#g" \
-    -e 's/[0-9][0-9]* AGs/N AGs/'
+_scratch_xfs_db -x -c 'version log2' | tr ',' '\n' | grep LOGV2
 _create_log
 
 # success, all done

index 36ffdecc..378876d8 100644
@@ -2,5 +2,4 @@ QA output created by 095
 
 *** mount failed: -o logbsize=64k ***
 
-xfs_chver: SCRATCH_DEV: changing version 0x3084 to 0x3484 in N AGs
-xfs_chver: SCRATCH_DEV: changing feature2 0x0 to 0x0 in N AGs
+LOGV2

deleted file mode 100755
index 09792a76..00000000

deleted file mode 100644
index 63772a0a..00000000

index 24f682cc..f4372e09 100644
@@ -3,6 +3,5 @@
 # - do not start group names with a digit
 # - comment line before each group is "new" description
 #
-098 udf auto
 101 udf
 102 udf

deleted file mode 100755
index 9609c072..00000000

deleted file mode 100644
index 1ca59a8c..00000000

index f4372e09..6680da44 100644
@@ -3,5 +3,4 @@
 # - do not start group names with a digit
 # - comment line before each group is "new" description
 #
-101 udf
 102 udf

deleted file mode 100755
index 24474f74..00000000

deleted file mode 100644
index a36396e2..00000000

deleted file mode 100755
index cf17388d..00000000

deleted file mode 100644
index 44d8e55e..00000000

index ffdb0615..e7de18dd 100644
@@ -111,8 +111,6 @@
 111 ioctl
 112 fuzzers
 113 fuzzers
-114 parent attr stress
-115 parent attr
 116 quota auto quick
 117 fuzzers
 118 auto quick fsr dangerous

deleted file mode 100755
index a3fe9c36..00000000

deleted file mode 100644
index 7e38ab37..00000000

deleted file mode 100755
index 89c441aa..00000000

deleted file mode 100644
index 58a426b5..00000000

index e7de18dd..fd634275 100644
@@ -54,8 +54,6 @@
 054 auto quick
 055 dump ioctl remote tape
 056 dump ioctl auto quick
-057 acl auto
-058 acl auto
 059 dump ioctl auto quick
 060 dump ioctl auto quick
 061 dump ioctl auto quick

index c840ce42..fae367f0 100644
@@ -117,18 +117,6 @@ _acl_ls()
     _ls_l -n $* | awk '{ print $1, $3, $4, $NF }' | _acl_filter_id
 } 
 
-#
-_acl_list()
-{
-    _file1=$1
-
-    if [ $HOSTOS = "IRIX" ]; then
-	ls -dD $_file1 | _acl_filter_id
-    else 
-        chacl -l $_file1 | _acl_filter_id
-    fi
-}
-
 # create an ACL with n ACEs in it
 #
 _create_n_aces()

deleted file mode 100755
index 4af588c8..00000000

deleted file mode 100644
index 3f4f663f..00000000

index 20c278cc..93a7378b 100644
@@ -101,7 +101,6 @@
 096 auto prealloc quick zero
 097 attr auto quick
 098 auto quick metadata
-099 udf auto
 100 udf auto
 101 auto quick metadata
 102 auto rw

similarity index 98%
rename from tests/shared/051
rename to tests/generic/099
index 298838e7..f65c53f1 100755
@@ -1,5 +1,5 @@
 #! /bin/bash
-# FS QA Test No. 051
+# FS QA Test No. 099
 #
 # Test out ACLs.
 #

@@ -67,7 +67,7 @@ _cleanup()
 #
 
 # real QA test starts here
-_supported_fs xfs udf
+_supported_fs generic
 _supported_os Linux
 _require_test
 _require_runas

@@ -292,10 +292,10 @@ popd >/dev/null
 chown -R 12345.54321 root
 echo "Change #1..."
 _runas -u 12345 -g 54321 -- chacl -r u::rwx,g::-w-,o::--x root
-find root -print | xargs chacl -l
+find root -print | sort | xargs chacl -l
 echo "Change #2..."
 _runas -u 12345 -g 54321 -- chacl -r u::---,g::---,o::--- root
-find root -print | xargs chacl -l
+find root -print | sort | xargs chacl -l
 
 #-------------------------------------------------------
 

similarity index 99%
rename from tests/shared/051.out
rename to tests/generic/099.out
index 2b5220f7..94172420 100644
@@ -1,4 +1,4 @@
-QA output created by 051
+QA output created by 099
 
 === Test minimal ACE ===
 Setup file

@@ -111,6 +111,8 @@ acldir/file2 [u::r--,g::r--,o::---]
 Change #1...
 root [u::rwx,g::-w-,o::--x]
 root/a [u::rwx,g::-w-,o::--x]
+root/a/0 [u::rwx,g::-w-,o::--x]
+root/a/0/mumble [u::rwx,g::-w-,o::--x]
 root/a/1 [u::rwx,g::-w-,o::--x]
 root/a/1/mumble [u::rwx,g::-w-,o::--x]
 root/a/2 [u::rwx,g::-w-,o::--x]

@@ -129,9 +131,9 @@ root/a/8 [u::rwx,g::-w-,o::--x]
 root/a/8/mumble [u::rwx,g::-w-,o::--x]
 root/a/9 [u::rwx,g::-w-,o::--x]
 root/a/9/mumble [u::rwx,g::-w-,o::--x]
-root/a/0 [u::rwx,g::-w-,o::--x]
-root/a/0/mumble [u::rwx,g::-w-,o::--x]
 root/b [u::rwx,g::-w-,o::--x]
+root/b/c0 [u::rwx,g::-w-,o::--x]
+root/b/c0/0 [u::rwx,g::-w-,o::--x]
 root/b/c1 [u::rwx,g::-w-,o::--x]
 root/b/c1/1 [u::rwx,g::-w-,o::--x]
 root/b/c2 [u::rwx,g::-w-,o::--x]

@@ -150,11 +152,11 @@ root/b/c8 [u::rwx,g::-w-,o::--x]
 root/b/c8/8 [u::rwx,g::-w-,o::--x]
 root/b/c9 [u::rwx,g::-w-,o::--x]
 root/b/c9/9 [u::rwx,g::-w-,o::--x]
-root/b/c0 [u::rwx,g::-w-,o::--x]
-root/b/c0/0 [u::rwx,g::-w-,o::--x]
 Change #2...
 root [u::---,g::---,o::---]
 root/a [u::---,g::---,o::---]
+root/a/0 [u::---,g::---,o::---]
+root/a/0/mumble [u::---,g::---,o::---]
 root/a/1 [u::---,g::---,o::---]
 root/a/1/mumble [u::---,g::---,o::---]
 root/a/2 [u::---,g::---,o::---]

@@ -173,9 +175,9 @@ root/a/8 [u::---,g::---,o::---]
 root/a/8/mumble [u::---,g::---,o::---]
 root/a/9 [u::---,g::---,o::---]
 root/a/9/mumble [u::---,g::---,o::---]
-root/a/0 [u::---,g::---,o::---]
-root/a/0/mumble [u::---,g::---,o::---]
 root/b [u::---,g::---,o::---]
+root/b/c0 [u::---,g::---,o::---]
+root/b/c0/0 [u::---,g::---,o::---]
 root/b/c1 [u::---,g::---,o::---]
 root/b/c1/1 [u::---,g::---,o::---]
 root/b/c2 [u::---,g::---,o::---]

@@ -194,8 +196,6 @@ root/b/c8 [u::---,g::---,o::---]
 root/b/c8/8 [u::---,g::---,o::---]
 root/b/c9 [u::---,g::---,o::---]
 root/b/c9/9 [u::---,g::---,o::---]
-root/b/c0 [u::---,g::---,o::---]
-root/b/c0/0 [u::---,g::---,o::---]
 
 === Test out error messages for ACL text parsing  ===
 Note: Old interface gave more informative error msgs

index 93a7378b..ee9a7539 100644
@@ -101,6 +101,7 @@
 096 auto prealloc quick zero
 097 attr auto quick
 098 auto quick metadata
+099 acl auto quick
 100 udf auto
 101 auto quick metadata
 102 auto rw

index fab93315..b3663a03 100644
@@ -11,7 +11,6 @@
 006 auto enospc
 007 dangerous_fuzzers
 032 mkfs auto quick
-051 acl udf auto quick
 272 auto enospc rw
 289 auto quick
 298 auto trim

index 11bf6a94..9456fa76 100644
@@ -2,44 +2,37 @@ _______________________
 BUILDING THE FSQA SUITE
 _______________________
 
-Building Linux:
-	- cd into the xfstests directory
-	- install prerequisite packages
-	  For example, for Ubuntu:
-		sudo apt-get install xfslibs-dev uuid-dev libtool-bin \
-		e2fsprogs automake gcc libuuid1 quota attr libattr1-dev make \
-		libacl1-dev libaio-dev xfsprogs libgdbm-dev gawk fio dbench \
-		uuid-runtime
-	  For Fedora, RHEL, or CentOS:
-		yum install acl attr automake bc dbench dump e2fsprogs fio \
-		gawk gcc indent libtool lvm2 make psmisc quota sed \
-		xfsdump xfsprogs \
-		libacl-devel libattr-devel libaio-devel libuuid-devel \
-		xfsprogs-devel btrfs-progs-devel
-		(Older distributions may require xfsprogs-qa-devel as well.)
-		(Note that for RHEL and CentOS, you may need the EPEL repo.)
-	- run make
-	- run make install
-	- create fsgqa test user ("sudo useradd fsgqa")
-	- create 123456-fsgqa test user ("sudo useradd 123456-fsgqa")
+- cd into the xfstests directory
+- install prerequisite packages
+  For example, for Ubuntu:
+	sudo apt-get install xfslibs-dev uuid-dev libtool-bin \
+	e2fsprogs automake gcc libuuid1 quota attr libattr1-dev make \
+	libacl1-dev libaio-dev xfsprogs libgdbm-dev gawk fio dbench \
+	uuid-runtime
+  For Fedora, RHEL, or CentOS:
+	yum install acl attr automake bc dbench dump e2fsprogs fio \
+	gawk gcc indent libtool lvm2 make psmisc quota sed \
+	xfsdump xfsprogs \
+	libacl-devel libattr-devel libaio-devel libuuid-devel \
+	xfsprogs-devel btrfs-progs-devel
+	(Older distributions may require xfsprogs-qa-devel as well.)
+	(Note that for RHEL and CentOS, you may need the EPEL repo.)
+- run make
+- run make install
+- create fsgqa test user ("sudo useradd fsgqa")
+- create 123456-fsgqa test user ("sudo useradd 123456-fsgqa")
 	
-Building IRIX:
-	- cd into the xfstests directory 
-	- set the ROOT and TOOLROOT env variables for IRIX appropriately
-	- run ./make_irix
-
 ______________________
 USING THE FSQA SUITE
 ______________________
 
-Preparing system for tests (IRIX and Linux):
+Preparing system for tests:
 
     - compile XFS into your kernel or load XFS modules
     - install administrative tools specific to the filesystem you wish to test
     - If you wish to run the udf components of the suite install
-      mkfs_udf and udf_db for IRIX and mkudffs for Linux. Also download and 
-      build the Philips UDF Verification Software from 
-      http://www.extra.research.philips.com/udf/, then copy the udf_test 
+      mkudffs. Also download and build the Philips UDF Verification Software
+      from http://www.extra.research.philips.com/udf/, then copy the udf_test
       binary to xfstests/src/. If you wish to disable UDF verification test
       set the environment variable DISABLE_UDF_TEST to 1.
 	

index da42caa1..a001c571 100755
@@ -252,7 +252,6 @@ fi
 #
 
 case $(uname -s) in
-	IRIX | IRIX64 )		dfOpts="-Pb"	;;
 	Linux)			dfOpts="-P"	;;
 	*)			dfOpts="-PB"	;;
 esac

index 60d52be3..1c3383a8 100755
@@ -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);

index e977a018..0edd41f1 100755
@@ -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

index 0433882d..d8cffeaa 100755
@@ -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

index 70f60738..030d90b1 100755
@@ -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
 

index 7a38dbfa..7309f1f3 100755
@@ -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.$$

index cfa45541..327bbe9c 100755
@@ -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 

index 1c9d8f7e..d23a58b1 100755
@@ -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

index f3c2f7cf..7c4b80c3 100755
@@ -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.$$

index e31fe354..d1ba697b 100755
@@ -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

index d2dcc282..28566956 100755
@@ -43,7 +43,7 @@ _cleanup()
 . ./common/filter
 
 _supported_fs generic
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_test
 _require_sparse_files

index 66c33c22..78f2b13d 100755
@@ -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

index a83d02d3..c2f02fb9 100755
@@ -46,7 +46,7 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs generic
-_supported_os IRIX Linux
+_supported_os Linux
 _require_scratch
 
 testfile=$SCRATCH_MNT/testfile

index 8e6827db..8b7e6fba 100755
@@ -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"
 

index fcb5f89b..3f25f8b8 100755
@@ -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"
 

index 784683eb..5dadab32 100755
@@ -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

index f0dc0df1..804b1b17 100755
@@ -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

index b49d09e3..5fa7b09f 100755
@@ -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

index 54cb557b..bf38d53a 100755
@@ -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

index 20f157e5..7d09b04c 100755
@@ -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

index dc2ab204..ae561fca 100755
@@ -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

index c7f19446..ef2b44c4 100755
@@ -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

index 65d430d1..cf0f4568 100755
@@ -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

index 4d4be59b..db415009 100755
@@ -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

index aed3b28c..1bbe3108 100755
@@ -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

index f9f5f5aa..bd12278c 100755
@@ -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

index aaf6bbf5..15586e9b 100755
@@ -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

index 7591b25c..de0c45c7 100755
@@ -45,7 +45,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs generic
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_test
 _require_attrs

index 737b49bf..5f205b50 100755
@@ -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

index 6a214bc3..321c7217 100755
@@ -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

index a29f160a..ac765333 100755
@@ -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

index 43c93d73..a4c111b9 100755
@@ -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."

index 2f8c4a0d..9f09a7b0 100755
@@ -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

index 5eeee50e..9c92c9bd 100755
@@ -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"
 

index 46ce6ae4..1f01c4f5 100755
@@ -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

index 7ffdfc07..7fd51a7d 100644
@@ -1,2 +1 @@
-irix: irix
 linux: linux

deleted file mode 100644
index f31ecf90..00000000

index daf9981a..bfdb93a1 100755
@@ -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"
 

index e5e819dc..8aff7b44 100755
@@ -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.

index 9b7beb4d..8b6aa526 100755
@@ -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

index b634861d..58165eaa 100755
@@ -76,7 +76,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs generic
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 _require_attrs

index 9cf4ea8d..7d65f620 100755
@@ -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

index 453ede4b..e0948dff 100755
@@ -46,7 +46,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs generic
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_test
 _require_user

index 1e96630e..90bd1693 100755
@@ -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

index aa52c7db..24e568b2 100755
@@ -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
 

index f1a221e0..37a86e83 100755
@@ -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
 

index 14b81321..52c1227b 100755
@@ -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

index d7c0eb9a..5690cd18 100755
@@ -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

index bdeb0334..9a8d017e 100755
@@ -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

index a099ec6d..cf6913ee 100755
@@ -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
 

index 28ca87da..0d2b2794 100755
@@ -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

index 75a2c23c..4605072e 100755
@@ -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
 

index 309540ac..f991b1b7 100755
@@ -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

index 578b1dab..de787e7a 100755
@@ -125,7 +125,7 @@ _do_workload()
 
 # real QA test starts here
 _supported_fs generic
-_supported_os IRIX Linux
+_supported_os Linux
 _require_scratch
 
 echo "------------------------------"

index 61ab2209..7d093865 100755
@@ -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"
 

index 955c4aca..4129cfcf 100755
@@ -44,7 +44,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs generic
-_supported_os IRIX Linux
+_supported_os Linux
 _require_scratch
 
 echo "------------------------------"

index c6b89db9..9dee88c7 100755
@@ -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"

index a9069260..5a3cb859 100755
@@ -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

index 3dd3bead..83ad21f4 100755
@@ -49,7 +49,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs generic
-_supported_os IRIX Linux
+_supported_os Linux
 _require_scratch
 
 threads=100

index 8139b4d5..7f4d3061 100755
@@ -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
 

index fb7420b0..408ade56 100755
@@ -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

index 2a6dbb78..7d2e1d2b 100755
@@ -48,7 +48,7 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs generic
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 _require_quota

index 452d26e3..fd162b60 100755
@@ -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

index 81d36608..17897ffb 100755
@@ -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
 

index 925524b8..7c6ced75 100755
@@ -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))

index 1810e850..3653a31b 100755
@@ -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

index 8fd46976..dd644c01 100755
@@ -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

index 0fd4cfa0..3cc52423 100755
@@ -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 ==="

index f27f4b79..f06c4f0f 100755
@@ -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

index 92ec915f..d80d380f 100755
@@ -43,7 +43,7 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os Linux Irix
+_supported_os Linux
 
 _require_scratch
 _require_xfs_quota

index 9f22087d..d38d320f 100755
@@ -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

index abef2e05..1a5bd4d3 100755
@@ -76,7 +76,7 @@ _filesize()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 

index 7b9a54d2..e2c810dd 100755
@@ -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

index 451735fd..253af940 100755
@@ -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 <<EOF
   version=2     logbsize=256k
 EOF
 
-if [ "$HOSTOS" = "IRIX" ]; then
-    start_blk=0
-else
-    start_blk=2
-fi
+start_blk=2
 
 # do the work for various log params which
 # should not effect the data content of the log

index 7ffdfc07..7fd51a7d 100644
@@ -1,2 +1 @@
-irix: irix
 linux: linux

deleted file mode 100644
index e3d3cd32..00000000

index 4d2fdeda..3e4f1692 100755
@@ -63,7 +63,7 @@ _filter_stat()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 

index b2b6142c..1cd6d28e 100755
@@ -43,13 +43,12 @@ _link_out_file
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_tape $TAPE_DEV
 
 # note: fsstress uses an endian dependent random number generator, running this
-# will produce different output for big/little endian machines. This issue was
-# resolved by using different Linux/IRIX out files.
+# will produce different output for big/little endian machines.
 _create_dumpdir_stress
 _erase_hard
 _do_dump_sub

index 7ffdfc07..7fd51a7d 100644
@@ -1,2 +1 @@
-irix: irix
 linux: linux

deleted file mode 100644
index f72876aa..00000000

index 9a899a86..d304384b 100755
@@ -42,7 +42,7 @@ _link_out_file
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_tape $TAPE_DEV
 _create_dumpdir_fill

index 7ffdfc07..7fd51a7d 100644
@@ -1,2 +1 @@
-irix: irix
 linux: linux

deleted file mode 100644
index 97845dd4..00000000

index 4cd77896..2111190b 100755
@@ -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
 
 _create_dumpdir_fill
 _do_dump_file

index 10056838..58a62482 100755
@@ -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
 
 _create_dumpdir_fill
 _do_dump_restore

index e6348902..19e09603 100755
@@ -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
 
 # wipe test dir clean first
 # so dump can be real quick

index 15f41edd..4d8d7d67 100755
@@ -67,7 +67,7 @@ _check_ag()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 _require_no_large_scratch_dev

index 7ffdfc07..7fd51a7d 100644
@@ -1,2 +1 @@
-irix: irix
 linux: linux

deleted file mode 100644
index 56adfd05..00000000

index 59d68c31..678c3249 100755
@@ -95,7 +95,7 @@ EOF
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 _require_no_large_scratch_dev

index 7ffdfc07..7fd51a7d 100644
@@ -1,2 +1 @@
-irix: irix
 linux: linux

deleted file mode 100644
index 32e902d4..00000000

index 6d644ad8..a6923b08 100755
@@ -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_scratch
 _require_test_program "feature"

index 45caf081..a6f93f29 100755
@@ -72,7 +72,7 @@ _filter_bad_ids()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 _require_no_large_scratch_dev

index 88e90e57..768ca9e0 100644
@@ -1,3 +1,2 @@
-irix: irix
 linux,crc: crc.linux
 linux: linux

deleted file mode 100644
index 59601179..00000000

index 25f2f697..6b6c86b7 100755
@@ -41,7 +41,7 @@ _link_out_file
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_tape $TAPE_DEV
 _create_dumpdir_fill

index 7ffdfc07..7fd51a7d 100644
@@ -1,2 +1 @@
-irix: irix
 linux: linux

deleted file mode 100644
index 653f950a..00000000

index 280d0366..c65523f5 100755
@@ -41,7 +41,7 @@ _link_out_file
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_tape $RMT_IRIXTAPE_DEV
 _create_dumpdir_fill

index 7ffdfc07..7fd51a7d 100644
@@ -1,2 +1 @@
-irix: irix
 linux: linux

deleted file mode 100644
index 6680373f..00000000

index 2f765b82..62735906 100755
@@ -41,7 +41,7 @@ _link_out_file
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_tape $RMT_IRIXTAPE_DEV
 _create_dumpdir_fill

index 7ffdfc07..7fd51a7d 100644
@@ -1,2 +1 @@
-irix: irix
 linux: linux

deleted file mode 100644
index 9bd188fe..00000000

index 50385288..1b9500f7 100755
@@ -46,7 +46,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
 
 _require_scratch
 _require_no_large_scratch_dev

index ba5eed32..182cebc3 100755
@@ -46,7 +46,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
 
 _require_scratch
 

index 59eeff6e..caca73da 100755
@@ -43,7 +43,7 @@ _link_out_file
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_tape $TAPE_DEV 
 _create_dumpdir_fill

index 7ffdfc07..7fd51a7d 100644
@@ -1,2 +1 @@
-irix: irix
 linux: linux

deleted file mode 100644
index 61c226cc..00000000

index 841c12b6..446a69dc 100755
@@ -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
 
 _create_dumpdir_symlinks
 _do_dump_file

index d7c0dce0..6ade1678 100755
@@ -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
 
 # wipe test dir clean first
 # so dump can be real quick

index 3dd685f0..32dbc057 100755
@@ -43,7 +43,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_test
 
 src/fault $TEST_DIR || exit

index 130df77e..ac7feb48 100755
@@ -46,7 +46,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 cp /dev/null $seqres.full
 chmod a+rwx $seqres.full	# arbitrary users will write here

@@ -213,12 +213,7 @@ EOF
 projid_file="$tmp.projid"
 
 echo "*** user"
-if [ "$HOSTOS" == "IRIX" ]
-then
-	_qmount_option "quota"
-else
-	_qmount_option "uquota"
-fi
+_qmount_option "uquota"
 _exercise u
 
 echo "*** group"

@@ -226,12 +221,7 @@ _qmount_option "gquota"
 _exercise g
 
 echo "*** uqnoenforce"
-if [ "$HOSTOS" == "IRIX" ]
-then
-	_qmount_option "qnoenforce"
-else
-	_qmount_option "uqnoenforce"
-fi
+_qmount_option "uqnoenforce"
 _exercise uno
 
 echo "*** gqnoenforce"

index 56231f37..faad218e 100755
@@ -48,7 +48,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
 
 rm -f $seqres.full
 

index 80c244dd..353dda34 100755
@@ -48,7 +48,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
 _require_scratch
 _require_attrs
 

index 920ba288..383058a5 100755
@@ -41,7 +41,7 @@ _link_out_file
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_tape $RMT_TAPE_USER@$RMT_IRIXTAPE_DEV
 _create_dumpdir_fill

deleted file mode 100644
index 8bff6e9c..00000000

index 7e2624a2..613539a7 100755
@@ -38,7 +38,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
 
 _create_dumpdir_fill_perm
 _do_dump_file

index 2600f03d..8a4e254a 100755
@@ -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
 
 # src/dumpfile based on dumping from
 # _create_dumpdir_fill_perm (small dump)

index 410b4870..306e2cce 100755
@@ -51,7 +51,7 @@ _ls_size_filter()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _create_dumpdir_hardlinks 9
 

index 6b2139f3..b7da0b8c 100755
@@ -58,7 +58,7 @@ _list_dir()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 #
 # too much hassle to get output matching with quotas turned on

index 736439b4..061ce2dd 100755
@@ -44,7 +44,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_test
 
 _my_stat_filter()

index cf69b66b..c214dd51 100755
@@ -100,7 +100,7 @@ write_block()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 [ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found"
 

index 43aa4211..5393cf8b 100755
@@ -44,7 +44,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
 
 [ -n "$XFS_IO_PROG" ] || _notrun "xfs_io executable not found"
 

index e0f5b1b9..20c4a72a 100755
@@ -42,9 +42,6 @@ _cleanup()
 }
 
 _supported_fs xfs
-
-# Apparently should be able to work on IRIX,
-# but not at the moment.
 _supported_os Linux
 _require_test
 

@@ -57,9 +54,6 @@ echo
 
 # real QA test starts here
 
-# to get sh working like ksh on IRIX
-export _XPG=1
-
 $here/ltp/rwtest.sh $quiet $clean -i 2000 -f direct,buffered,sync
 status=$?
 [ $status -ne 0 ] && exit

index 6f6f8256..b54c8d54 100755
@@ -38,7 +38,7 @@ status=1	# failure is the default!
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _cleanup()
 {

@@ -62,12 +62,6 @@ _scratch_unmount >/dev/null 2>&1
 # do a simple quota test to ensure DQUOT data is happening
 export MOUNT_OPTIONS="-o quota,gquota"
 
-if [ "$HOSTOS" = "IRIX" ]; then 
-    start=0
-else
-    start=2
-fi
-
 # mount with quotas?
 _scratch_mkfs_xfs "-l version=1" 1>/dev/null 2>&1
 _qmount

@@ -77,7 +71,7 @@ _scratch_unmount
 _mkfs_log "-l version=1"
 _create_log
 _check_log
-_print_transaction_inode $start
+_print_transaction_inode 2
 _cmp_output $seq.ugquota.trans_inode $filtered
 
 # got thru it all so we may have success

index 0c0b98af..f824d5ef 100755
@@ -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.*

@@ -88,12 +88,6 @@ for s in sync nosync ; do
 	if [ "$mkfs" = "#" ]; then 
 	    continue
 	fi
-	if [ "$HOSTOS" = "IRIX" ]; then 
-	    # don't have umount rec at start on IRIX
-	    # so we won't have to skip over it and get to 
-	    # another stripe boundary
-	    start=0
-	fi
 	echo "--- mkfs=$mkfs, mnt=$mnt, sync=$s ---"
 	export MOUNT_OPTIONS="-o $mnt"
 	if ! _mkfs_log "-l $mkfs"; then

index 7ffdfc07..7fd51a7d 100644
@@ -1,2 +1 @@
-irix: irix
 linux: linux

deleted file mode 100644
index e3d3cd32..00000000

index 7aa193b5..6d20ef3a 100755
@@ -50,17 +50,9 @@ pgsize=`$here/src/feature -s`
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_test
 
-if [ $HOSTOS == "IRIX" ]; then 
-    if uname -R | grep -iq debug; then 
-        # taking up to 23 mins on my 512K octane on debug
-        # not worth worrying about
-	_notrun "don't bother running on debug IRIX"
-    fi
-fi
-
 echo
 echo "*** First case - I/O blocksize same as pagesize"
 $here/src/resvtest -i 20 -b $pgsize "$TEST_DIR/resv" | _filter_resv

index f195077d..5a693195 100755
@@ -45,7 +45,7 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_scratch
 _require_no_large_scratch_dev
 

index bf9eb2f9..d3606f81 100755
@@ -43,7 +43,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_realtime
 _require_scratch
 

index 64754b2a..a9451f43 100755
@@ -102,7 +102,7 @@ rm -f $seqres.full
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_scratch
 _require_v2log
 _require_xfs_mkfs_without_validation

index 48b8c59c..024416bd 100755
@@ -64,7 +64,7 @@ _filter_noymlinks_flag()
 }
 
 # real QA test starts here
-_supported_os Linux IRIX
+_supported_os Linux
 _supported_fs xfs
 _require_scratch
 

index 2bd20a3d..7640bff3 100755
@@ -51,7 +51,7 @@ s/Inode: \#\d+ \(\d+ blocks, \d+ extents\)/Inode: #[INO] (X blocks, Y extents)/;
 }
 
 _supported_fs xfs
-_supported_os Linux #IRIX
+_supported_os Linux
 _require_scratch
 _require_xfs_quota
 

index addb8e7d..86415366 100755
@@ -38,7 +38,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux #IRIX
+_supported_os Linux
 _require_scratch
 _require_xfs_quota
 

index 1d13d15d..af2bcb99 100755
@@ -47,7 +47,7 @@ _cleanup()
 # real QA test starts here
 
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 _require_xfs_quota

index a5f5593f..fac3aa77 100755
@@ -53,7 +53,7 @@ _cleanup()
 rm -f $seqres.full
 
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 _require_command "$XFS_FSR_PROG" "xfs_fsr"

index 156d5e4a..ad6db455 100755
@@ -47,7 +47,7 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 

index d301808b..2f84a3c8 100755
@@ -42,7 +42,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
 
 rm -f $seqres.full
 rm -f $tmp.log

index 0177698a..cbba64f7 100755
@@ -50,7 +50,7 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 _require_attrs

index a1efcc23..8a11d8bc 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index c389a2b8..4a3bd473 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index 41041c4e..da3995e9 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index 44b3e4ef..14a979b5 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index f6cd3f30..ea448db2 100755
@@ -45,7 +45,7 @@ _report_filter () {
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 # link correct .out file
 _link_out_file

index 7ffdfc07..7fd51a7d 100644
@@ -1,2 +1 @@
-irix: irix
 linux: linux

deleted file mode 100644
index 827be545..00000000

index 73ff7f9f..26b885c7 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index 42c04810..89f6906d 100755
@@ -63,7 +63,7 @@ _check_ag()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 _require_no_large_scratch_dev

index 1307d5c0..a72a5ba4 100755
@@ -97,7 +97,7 @@ EOF
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 _require_no_large_scratch_dev

index f9e690a9..8ab2682d 100755
@@ -43,7 +43,7 @@ _filter_fs_handle()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index bba70944..982f10b4 100755
@@ -64,7 +64,7 @@ _check_sids()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index 72bdabf2..1a6473f2 100755
@@ -44,7 +44,7 @@ _filter_handles()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index cac77228..4fd348d6 100755
@@ -39,7 +39,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index 810a6ac1..398dd280 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index 1a1631e2..6f5ebfe3 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index d6e22b66..9e17e078 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index bf655902..ac7b63b7 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index 596f4c24..22710a12 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index fc5193ff..29bd7243 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index 9a2e2d04..8b8e2ec4 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index 11e53def..4124c7f9 100755
@@ -45,7 +45,7 @@ _filter_get_allocinfo()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index 4edb68fd..4e6fc6f7 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index e283545c..32fff300 100755
@@ -49,7 +49,7 @@ _filter_handles()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

index 64133240..d8efaa63 100755
@@ -66,7 +66,7 @@ _filter_bmap()
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_test
 
 testfile=$TEST_DIR/file.$seq

index 4080a88d..c4ae531f 100755
@@ -63,7 +63,7 @@ _filter_bmap()
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_test
 
 # io tests 

index f772bc40..c5ae8e45 100755
@@ -47,7 +47,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 

index 43ef5ab1..17463d79 100755
@@ -46,7 +46,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 

index 8c4f9a6f..3a20a9e4 100755
@@ -46,7 +46,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 

index 5e2e61b0..daa65a96 100755
@@ -46,7 +46,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 

index a2010455..07d75171 100755
@@ -49,7 +49,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
 
 rm -f $seqres.full
 rm -f $tmp.log

index 17334de5..d7dfef7a 100755
@@ -38,7 +38,7 @@ trap "exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux IRIX
+_supported_os Linux
 
 _require_scratch
 _scratch_mkfs_xfs -b size=512 >/dev/null 2>&1

index 8798ecf9..370b93ca 100755
@@ -51,7 +51,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_scratch
 _require_xfs_mkfs_ciname
 rm -f $seqres.full

index e9e85889..3226431f 100755
@@ -42,7 +42,7 @@ _cleanup()
 
 # only xfs supported due to use of xfs_bmap
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 # real QA test starts here
 rm -f $seqres.full

index d549a4cc..70997e3f 100755
@@ -52,7 +52,7 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_test
 _require_loop
 

index c1cbe32c..3f5295c5 100755
@@ -41,7 +41,7 @@ _cleanup()
 . ./common/filter
 
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 # real QA test starts here
 rm -f $seqres.full

index db890b5d..98404085 100755
@@ -45,7 +45,7 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_test
 
 fsfile=$TEST_DIR/fsfile.$seq

index 6ac08c6f..60245a99 100755
@@ -44,7 +44,7 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_command "$MAN_PROG" man
 

index 2325537c..c783df72 100755
@@ -45,7 +45,7 @@ _cleanup()
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 _require_scratch
 _require_attrs
 

index 9accffd4..708a7f86 100755
@@ -44,7 +44,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 _require_scratch
 _require_freeze

index de7b27ea..532abd7f 100755
@@ -43,7 +43,7 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
 
 echo "Silence is golden"
 

index c0736486..fcbc0cd4 100644
@@ -234,19 +234,6 @@
 /dmapi/src/suite2/src/test_rights
 
 # Symlinked files
-/tests/generic/088.out
-/tests/xfs/018.op
-/tests/xfs/022.out
-/tests/xfs/023.out
-/tests/xfs/030.out
-/tests/xfs/031.out
 /tests/xfs/033.out
-/tests/xfs/035.out
-/tests/xfs/036.out
-/tests/xfs/039.out
-/tests/xfs/043.out
-/tests/xfs/055.out
 /tests/xfs/071.out
-/tests/xfs/082.op
 /tests/xfs/096.out
-/tests/xfs/146.out

index 1f01c4f5..8d31741b 100755
@@ -42,9 +42,6 @@ _filter()
     _filter_test_dir | sed -e '/----------/d'
 }
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux

deleted file mode 100644
index 7fd51a7d..00000000

similarity index 100%
rename from tests/generic/088.out.linux
rename to tests/generic/088.out

index 253af940..b2913821 100755
@@ -53,9 +53,6 @@ rm -f $seqres.full $tmp.*
 _require_scratch
 _require_v2log
 
-# link correct .out file
-_link_out_file_named $seqfull.op $(_get_os_name)
-
 echo "*** init FS"
 _scratch_unmount >/dev/null 2>&1
 

deleted file mode 100644
index 7fd51a7d..00000000

similarity index 100%
rename from tests/xfs/018.op.linux
rename to tests/xfs/018.op

index 1cd6d28e..ebe539ab 100755
@@ -38,9 +38,6 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux

deleted file mode 100644
index 7fd51a7d..00000000

similarity index 100%
rename from tests/xfs/022.out.linux
rename to tests/xfs/022.out

index d304384b..fff49d56 100755
@@ -37,9 +37,6 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux

deleted file mode 100644
index 7fd51a7d..00000000

similarity index 100%
rename from tests/xfs/023.out.linux
rename to tests/xfs/023.out

index 4d8d7d67..bc807753 100755
@@ -45,9 +45,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common/filter
 . ./common/repair
 
-# link correct .out file
-_link_out_file
-
 # nuke the superblock, AGI, AGF, AGFL; then try repair the damage
 #
 _check_ag()

deleted file mode 100644
index 7fd51a7d..00000000

similarity index 100%
rename from tests/xfs/030.out.linux
rename to tests/xfs/030.out

index 678c3249..b05f28b0 100755
@@ -38,9 +38,6 @@ rm -f $seqres.full
 . ./common/repair
 . ./common/filter
 
-# link correct .out file
-_link_out_file
-
 _check_repair()
 {
 	echo "Repairing, round 0" >> $seqres.full

deleted file mode 100644
index 7fd51a7d..00000000

similarity index 100%
rename from tests/xfs/031.out.linux
rename to tests/xfs/031.out

index a6f93f29..321856fc 100755
@@ -86,9 +86,9 @@ if [ $isize -lt 512 ]; then
 fi
 
 # link correct .out file
-FEATURES=$(_get_os_name)
+FEATURES=
 if [ $_fs_has_crcs -eq 1 ]; then
-	FEATURES=$FEATURES,crc
+	FEATURES=crc
 fi
 _link_out_file_named $seqfull.out "$FEATURES"
 

index 768ca9e0..46df3b03 100644
@@ -1,2 +1 @@
-linux,crc: crc.linux
-linux: linux
+crc: crc

similarity index 100%
rename from tests/xfs/033.out.crc.linux
rename to tests/xfs/033.out.crc

similarity index 100%
rename from tests/xfs/033.out.linux
rename to tests/xfs/033.out.default

index 6b6c86b7..1fde45df 100755
@@ -36,9 +36,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux

deleted file mode 100644
index 7fd51a7d..00000000

similarity index 100%
rename from tests/xfs/035.out.linux
rename to tests/xfs/035.out

index c65523f5..2a930b20 100755
@@ -36,9 +36,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux

deleted file mode 100644
index 7fd51a7d..00000000

similarity index 100%
rename from tests/xfs/036.out.linux
rename to tests/xfs/036.out

index 62735906..51d5544a 100755
@@ -36,9 +36,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux

deleted file mode 100644
index 7fd51a7d..00000000

similarity index 100%
rename from tests/xfs/039.out.linux
rename to tests/xfs/039.out

index caca73da..9bd6f1ec 100755
@@ -38,9 +38,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux

deleted file mode 100644
index 7fd51a7d..00000000

similarity index 100%
rename from tests/xfs/043.out.linux
rename to tests/xfs/043.out

index 383058a5..9f67e176 100755
@@ -36,9 +36,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux

similarity index 100%
rename from tests/xfs/055.out.linux
rename to tests/xfs/055.out

index f824d5ef..03878379 100755
@@ -54,9 +54,6 @@ rm -f $seqres.full $tmp.*
 _require_scratch
 _require_v2log 
 
-# link correct .out file
-_link_out_file_named $seqfull.op $(_get_os_name)
-
 echo "*** init FS"
 _scratch_unmount >/dev/null 2>&1
 

deleted file mode 100644
index 7fd51a7d..00000000

similarity index 100%
rename from tests/xfs/082.op.linux
rename to tests/xfs/082.op

index ea448db2..9d93e951 100755
@@ -47,9 +47,6 @@ _report_filter () {
 _supported_fs xfs
 _supported_os Linux
 
-# link correct .out file
-_link_out_file
-
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1
 _dmapi_scratch_mount

deleted file mode 100644
index 7fd51a7d..00000000

similarity index 100%
rename from tests/xfs/146.out.linux
rename to tests/xfs/146.out

index 5091db9d..80598d06 100644
@@ -52,15 +52,10 @@
 export LANG=C
 export LC_ALL=C
 
-# Warning: don't put freeware before /usr/bsd on IRIX coz you'll
-#  get the wrong hostname and set your system name to -s  :)
-[ -d /usr/bsd ] && PATH=$PATH:/usr/bsd
-[ -d /usr/freeware/bin ] && PATH=$PATH:/usr/freeware/bin
 PATH=".:$PATH"
 
 export HOST=`hostname -s`
 export HOSTOS=`uname -s`
-[ "$HOSTOS" = "IRIX64" ] && export HOSTOS="IRIX"
 
 export MODULAR=0               # using XFS as a module or not
 export BOOT="/boot"            # install target for kernels

@@ -220,13 +215,6 @@ fi
 export UDEV_SETTLE_PROG
 
 case "$HOSTOS" in
-    IRIX*)
-        export MKFS_XFS_PROG="`set_prog_path mkfs_xfs`"
-        export MKFS_UDF_PROG="`set_prog_path mkfs_udf`"
-        export XFS_FSR_PROG="`set_prog_path /usr/etc/fsr_xfs`"
-        export MKFS_NFS_PROG="false"
-        export MKFS_CIFS_PROG="false"
-        ;;
     Linux)
         export MKFS_XFS_PROG="`set_prog_path mkfs.xfs`"
         export MKFS_EXT4_PROG="`set_prog_path mkfs.ext4`"

index d6663e0c..b0e4a12f 100644
@@ -395,8 +395,6 @@ End-of-File
 
 _mk_fillconfig_perm()
 {
-    # dir_guid: ugo=rwx,g+s on dir is for IRIX chmod(1)
-
     cat <<End-of-File >$tmp.config
 # pathname	size/dir  user group mode
 #

@@ -406,7 +404,7 @@ file_sticky	10	$nobody	$nobody	01777
 file_mix1	10	$nobody	$nobody	761
 file_mix2	10	$nobody	$nobody	642
 dir_suid	d	$nobody	$nobody	04777
-dir_guid	d	$nobody	$nobody	ugo=rwx,g+s
+dir_guid	d	$nobody	$nobody	02777
 dir_sticky	d	$nobody	$nobody	01777
 dir_mix1	d	$nobody	$nobody	761
 dir_mix2	d	$nobody	$nobody	642

@@ -798,25 +796,6 @@ _ls_filter()
   | sed -e 's/total [0-9][0-9]*/total TOTAL/'
 }
 
-#
-# Filtering of Irix character hwgraph device names
-# e.g.
-# chardev: /hw/node/xtalk/15/pci/0/scsi_ctlr/0/target/1/lun/0/disk/partition/4/char
-# blkdev:  /dev/dsk/dks0d1s4
-#
-_filter_devchar()
-{
-    $AWK_PROG '
-	/\/hw\/node/ {
-	    sub(/\/hw.*scsi_ctlr\//,"/dev/dsk/dks")  # blah blah /dev/dsk/dks0/target/1/....
-	    sub(/\/target\//,"d")                    # blah blah /dev/dsk/dks0d1/lun/0/disk.....
-	    sub(/\/lun.*partition\//,"s")            # blah blah /dev/dsk/dks0d1s4/char
-	    sub(/\/char/,"")			     # blah blah /dev/dsk/dks0d1s4
-	}
-	{ print }
-    '
-}
-
 
 #
 # Filter out the non-deterministic dump msgs from

@@ -824,7 +803,6 @@ _filter_devchar()
 #
 _dump_filter_main()
 {
-  _filter_devchar |\
   sed \
       -e "s#$__XFSDUMP_PROG#xfsdump#"			\
       -e "s#$XFSRESTORE_PROG#xfsrestore#"		\

@@ -1191,7 +1169,7 @@ _do_restore_toc()
     echo "Contents of dump ..."
     opts="$_restore_debug$restore_args -f $dump_file -t"
     echo "xfsrestore $opts" | _dir_filter
-    cd $SCRATCH_MNT # for IRIX which needs xfs cwd
+    cd $SCRATCH_MNT
     $XFSRESTORE_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter_main |\
     _check_quota_file |\
     _check_quota_entries |\

@@ -1484,25 +1462,14 @@ _check_quota_entries()
 # xfsrestore: user quota information written to ...'
 # xfsrestore: group quota information written to ...'
 # xfsrestore: project quota information written to ...'
-#
-# If on IRIX then look for:
-# xfsrestore: use 'edquota' to restore quotas
-# Else look for:
 # xfsrestore: use 'xfs_quota' to restore quotas
 #
 _check_quota_dumprestore()
 {
-    if [ "$HOSTOS" == "IRIX" ]; then
 	_check_quota 'user quota information' \
 		     'group quota information' \
 		     'project quota information' | \
-	sed "/xfsrestore:.*use 'edquota' to restore quotas/d"
-    else
-	_check_quota 'user quota information' \
-		     'group quota information' \
-		     'project quota information' | \
-	sed "/xfsrestore:.*use 'xfs_quota' to restore quotas/d"
-    fi
+		sed "/xfsrestore:.*use 'xfs_quota' to restore quotas/d"
 }
 
 #

70 lines not on this page · raw message

index d1c19ff5..bdb4ed68 100644
@@ -314,7 +314,6 @@ _print_operation()
 # and may not match with the FS mounted at a different LR size 
 # => xlog_do_recovery_pass() can not handle the different hdr sizes
 #    it assumes them all to be the same between the start..finish
-# NB: On IRIX there is no UMOUNT record and so we could start from -s 0.
 
 _print_transaction_inode()
 {

index fa1314c6..d3bf8339 100644
@@ -238,7 +238,7 @@ _scratch_options()
 
     case $type in
     mkfs)
-	[ "$HOSTOS" != "IRIX" ] && SCRATCH_OPTIONS="$SCRATCH_OPTIONS -f"
+	SCRATCH_OPTIONS="$SCRATCH_OPTIONS -f"
 	rt_opt="-r"
         log_opt="-l"
 	;;

@@ -287,14 +287,7 @@ _mount_ops_filter()
     [ $last_index -gt 0 ] && shift $last_index
     FS_ESCAPED=$1
     
-    # irix is fussy about how it is fed its mount options
-    # - multiple -o's are not allowed
-    # - no spaces between comma delimitered options
-    # the sed script replaces all -o's (except the first) with a comma
-    # not required for linux, but won't hurt
-    
-    echo $params | sed -e 's/[[:space:]]\+-o[[:space:]]*/UnIqUe/1; s/[[:space:]]\+-o[[:space:]]*/,/g; s/UnIqUe/ -o /1' \
-        | sed -e 's/dmapi/dmi/' \
+    echo $params | sed -e 's/dmapi/dmi/' \
         | $PERL_PROG -ne "s#mtpt=[^,|^\n|^\s]*#mtpt=$FS_ESCAPED\1\2#; print;"
 
 }

@@ -2116,12 +2109,7 @@ s,^\s*$,,;
 
 _user_do()
 {
-    if [ "$HOSTOS" == "IRIX" ]
-	then
-	echo $1 | /bin/bash "su $qa_user 2>&1" | _filter_user_do
-    else
 	echo $1 | su -s /bin/bash $qa_user 2>&1 | _filter_user_do
-    fi
 }
 
 _require_xfs_io_command()

@@ -2693,9 +2681,7 @@ _full_platform_details()
 
 _get_os_name()
 {
-	if [ "`uname`" == "IRIX64" ] || [ "`uname`" == "IRIX" ]; then
-		echo 'irix'
-	elif [ "`uname`" == "Linux" ]; then
+	if [ "`uname`" == "Linux" ]; then
 		echo 'linux'
 	else
 		echo Unknown operating system: `uname`

@@ -3259,9 +3245,6 @@ run_check()
 
 _require_test_symlinks()
 {
-	# IRIX UDF does not support symlinks
-	[ "$HOSTOS" = "IRIX" -a "$FSTYP" = 'udf' ] && \
-		_notrun "Require symlinks support"
 	target=`mktemp -p $TEST_DIR`
 	link=`mktemp -p $TEST_DIR -u`
 	ln -s `basename $target` $link

index 843ff6b6..57092f1c 100644
@@ -42,45 +42,32 @@ AC_CHECK_HEADERS([xfs/xfs_log_format.h],,,[
 
 AC_PACKAGE_NEED_UUIDCOMPARE
 
-case $pkg_platform
-in
-	irix)
-		AC_PACKAGE_NEED_SYS_ACL_H
-		AC_PACKAGE_NEED_ATTRIBUTES_H
-		AC_PACKAGE_WANT_NDBM
-		AC_PACKAGE_NEED_IRIX_LIBHANDLE
-		have_attr_list=true
-		AC_SUBST(have_attr_list)
-		;;
-	*)
-		AC_MULTILIB($enable_lib64)
-		AC_PACKAGE_NEED_XFS_XFS_H
-		AC_PACKAGE_WANT_LIBXFS_H
-		AC_PACKAGE_WANT_XLOG_ASSIGN_LSN
-		AC_PACKAGE_NEED_XFS_XQM_H
-		AC_PACKAGE_NEED_XFSCTL_MACRO
-		AC_PACKAGE_NEED_XFS_HANDLE_H
+AC_MULTILIB($enable_lib64)
+AC_PACKAGE_NEED_XFS_XFS_H
+AC_PACKAGE_WANT_LIBXFS_H
+AC_PACKAGE_WANT_XLOG_ASSIGN_LSN
+AC_PACKAGE_NEED_XFS_XQM_H
+AC_PACKAGE_NEED_XFSCTL_MACRO
+AC_PACKAGE_NEED_XFS_HANDLE_H
 
-		AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE
-		AC_PACKAGE_NEED_ATTR_XATTR_H
-		AC_PACKAGE_NEED_ATTRIBUTES_H
-		AC_PACKAGE_WANT_ATTRLIST_LIBATTR
-		AC_PACKAGE_NEED_GETXATTR_LIBATTR
+AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE
+AC_PACKAGE_NEED_ATTR_XATTR_H
+AC_PACKAGE_NEED_ATTRIBUTES_H
+AC_PACKAGE_WANT_ATTRLIST_LIBATTR
+AC_PACKAGE_NEED_GETXATTR_LIBATTR
 
-		AC_PACKAGE_NEED_SYS_ACL_H
-		AC_PACKAGE_NEED_ACL_LIBACL_H
-		AC_PACKAGE_NEED_ACLINIT_LIBACL
+AC_PACKAGE_NEED_SYS_ACL_H
+AC_PACKAGE_NEED_ACL_LIBACL_H
+AC_PACKAGE_NEED_ACLINIT_LIBACL
 
-		AC_PACKAGE_WANT_GDBM
-		AC_PACKAGE_WANT_AIO
-		AC_PACKAGE_WANT_DMAPI
-		AC_PACKAGE_WANT_LINUX_FIEMAP_H
-		AC_PACKAGE_WANT_FALLOCATE
-		AC_PACKAGE_WANT_OPEN_BY_HANDLE_AT
-		AC_PACKAGE_WANT_LINUX_PRCTL_H
-		AC_PACKAGE_WANT_LINUX_FS_H
-		;;
-esac
+AC_PACKAGE_WANT_GDBM
+AC_PACKAGE_WANT_AIO
+AC_PACKAGE_WANT_DMAPI
+AC_PACKAGE_WANT_LINUX_FIEMAP_H
+AC_PACKAGE_WANT_FALLOCATE
+AC_PACKAGE_WANT_OPEN_BY_HANDLE_AT
+AC_PACKAGE_WANT_LINUX_PRCTL_H
+AC_PACKAGE_WANT_LINUX_FS_H
 
 AC_CHECK_FUNCS([renameat2])
 

index 38fb9c60..cb52b99a 100644
@@ -76,9 +76,6 @@ endif
 ifeq ($(PKG_PLATFORM),darwin)
 PCFLAGS = -traditional-cpp $(GCCFLAGS)
 endif
-ifeq ($(PKG_PLATFORM),irix)
-PCFLAGS = -nostdinc -I$(ROOT)/usr/include -I$(TOPDIR)/../irix/include
-endif
 ifeq ($(PKG_PLATFORM),freebsd)
 endif
 

index 5bea4927..eed83f48 100644
@@ -17,10 +17,6 @@ ifeq ($(HAVE_ATTR_LIST), true)
 LCFLAGS += -DHAVE_ATTR_LIST
 LLDLIBS += $(LIBATTR)
 endif
-ifeq ($(PKG_PLATFORM),irix)
-LCFLAGS += -DHAVE_ATTR_LIST
-LLDLIBS += $(LIBATTR)
-endif
 
 ifeq ($(HAVE_AIO), true)
 TARGETS += aio-stress

index 72fbbb78..ce7a8c51 100644
@@ -39,7 +39,7 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
     AC_SUBST(pkg_distribution)
 
-    pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'`
+    pkg_platform=`uname -s | tr 'A-Z' 'a-z'`
     test -z "$PLATFORM" || pkg_platform="$PLATFORM"
     AC_SUBST(pkg_platform)
   ])

index 5156ced6..fb123f33 100644
@@ -67,7 +67,7 @@ AC_DEFUN([AC_HAVE_SENDFILE],
   ])
 
 #
-# Check if we have a getmntent libc call (IRIX, Linux)
+# Check if we have a getmntent libc call (Linux)
 #
 AC_DEFUN([AC_HAVE_GETMNTENT],
   [ AC_MSG_CHECKING([for getmntent ])

index 726406c8..108ef455 100644
@@ -41,7 +41,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
     AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
 
     if test -z "$MAKE"; then
-        AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+        AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin)
     fi
     if test -z "$MAKE"; then
         AC_PATH_PROG(MAKE, make,, /usr/bin)

@@ -54,19 +54,19 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
 	AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
     fi
     if test -z "$LIBTOOL"; then
-	AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+	AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin)
     fi
     libtool=$LIBTOOL
     AC_SUBST(libtool)
     AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
 
     if test -z "$TAR"; then
-        AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
+        AC_PATH_PROG(TAR, tar,, /bin:/usr/local/bin:/usr/bin)
     fi
     tar=$TAR
     AC_SUBST(tar)
     if test -z "$ZIP"; then
-        AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
+        AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin)
     fi
 
     zip=$ZIP

@@ -108,14 +108,14 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
 
     if test "$enable_gettext" = yes; then
         if test -z "$MSGFMT"; then
-                AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+                AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin)
         fi
         msgfmt=$MSGFMT
         AC_SUBST(msgfmt)
         AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
 
         if test -z "$MSGMERGE"; then
-                AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+                AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin)
         fi
         msgmerge=$MSGMERGE
         AC_SUBST(msgmerge)

@@ -123,7 +123,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
     fi
 
     if test -z "$RPM"; then
-        AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
+        AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin)
     fi
     rpm=$RPM
     AC_SUBST(rpm)

index 5588e9ed..9be56e11 100644
@@ -92,19 +92,6 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE],
     AC_SUBST(libhdl)
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_IRIX_LIBHANDLE],
-  [ 
-    AC_MSG_CHECKING([libhandle.a for IRIX])
-    libhdl="`pwd`/../irix/libhandle/libhandle.a"
-    if ! test -f $libhdl; then
-	echo 'no'
-        echo 'FATAL ERROR: could not find IRIX XFS handle library.'
-        exit 1
-    fi
-    echo 'yes'
-    AC_SUBST(libhdl)
-  ])
-
 AC_DEFUN([AC_PACKAGE_NEED_XFSCTL_MACRO],
   [ AC_MSG_CHECKING([xfsctl from xfs/xfs.h])
     AC_TRY_LINK([

deleted file mode 100755
index d1782785..00000000

index cb608ad4..b8aff49e 100644
@@ -49,10 +49,6 @@ ifeq ($(PKG_PLATFORM),linux)
 TARGETS += $(LINUX_TARGETS)
 endif
 
-ifeq ($(PKG_PLATFORM),irix)
-LLDLIBS += -lgen
-endif
-
 ifeq ($(HAVE_DB), true)
 TARGETS += dbtest
 LLDLIBS += $(LIBGDBM)