* [PATCH v2 01/15] tests: port generic/093 to Linux
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 02/15] tests: port generic/097 " Eric Biggers
` (14 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
This IRIX-specific test mainly tested whether a file's capabilities are
cleared when it is written to. Port the test to the Linux libcap tools
and update it to expect the Linux semantics which are a little simpler:
capabilities are always cleared even if the program is root (or has
CAP_FSETID). The test also tests that chmod doesn't affect open file
descriptors; this is mostly unrelated, but keep it in for now.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
src/writemod.c | 4 +-
tests/generic/093 | 113 ++++++++++----------------------------------------
tests/generic/093.out | Bin 917 -> 372 bytes
tests/generic/group | 2 +-
4 files changed, 26 insertions(+), 93 deletions(-)
diff --git a/src/writemod.c b/src/writemod.c
index 0c9ff1a5..16b3fa0c 100644
--- a/src/writemod.c
+++ b/src/writemod.c
@@ -35,7 +35,7 @@ main(int argc, char* argv[])
{
char *path;
int fd;
- char *buf = "hi there";
+ char *buf = "hi there\n";
ssize_t x;
int sts;
@@ -59,7 +59,7 @@ main(int argc, char* argv[])
return 1;
}
printf("write to the file\n");
- x = write(fd, buf, strlen(buf)+1);
+ x = write(fd, buf, strlen(buf));
if (x == -1) {
perror("write");
return 1;
diff --git a/tests/generic/093 b/tests/generic/093
index 824e9b27..807d886f 100755
--- a/tests/generic/093
+++ b/tests/generic/093
@@ -1,13 +1,11 @@
#! /bin/bash
# FS QA Test No. 093
#
-# Test out for IRIX the removal of file capabilities when
-# writing to the file (when it doesn't have CAP_FSETID & CAP_SETFCAP)
-# i.e. not root.
-# Test out fix for pv#901019
+# Test clearing of capabilities on write.
#
#-----------------------------------------------------------------------
# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved.
+# Copyright (c) 2017 Google, Inc. All Rights Reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -43,23 +41,18 @@ _cleanup()
[ -n "$TEST_DIR" ] && rm -f $file
}
-_testfilter()
+filefilter()
{
- sed -e "s#$TEST_DIR#TESTDIR#g"
-}
-
-_filefilter()
-{
- sed -e "s#$tmp##" -e "s#$file#file#"
+ sed -e "s#$file#file#"
}
# real QA test starts here
_supported_fs generic
-_supported_os IRIX
+_supported_os Linux
_require_test
_require_attrs
-_require_runas
+_require_user
rm -f $seqres.full
@@ -67,91 +60,31 @@ echo "QA output created by $seq"
echo ""
file=$TEST_DIR/$seq.file
-user=`grep ':all=:all=' /etc/capability | tail -1 | $AWK_PROG -F: '{print $1}'`
-uid=`_cat_passwd | grep $user | $AWK_PROG -F: '{print $3}'`
-
-cat >$tmp.append <<EOF
-#!/bin/bash
-echo data >>$file
-EOF
-chmod ugo+x $tmp.append
-
-echo "touch file"
+rm -f $file
touch $file
-chmod ugo+w $file
-
-echo "chcap on file"
-chcap CAP_CHOWN+p $file
-
-echo "ls -P on file"
-ls -P $file | _testfilter
-
-echo "append to file as root"
-$tmp.append
-
-echo "ls -P on file"
-ls -P $file | _testfilter
-
-echo "cat file"
-echo "----"
-cat $file
-echo "----"
-
-echo "append to file as user without caps"
-# in particular user doesn't have FSETID or SETFCAP
-_runas -u $uid $tmp.append
-echo "cat file"
-echo "----"
+echo "**** Verifying that appending to file clears capabilities ****"
+setcap cap_chown+ep $file
+getcap $file | filefilter
+echo data1 >> $file
cat $file
-echo "----"
+getcap $file | filefilter
+echo
-echo "ls -P on file"
-ls -P $file | _testfilter
-
-# try again when it doesn't have the EA
-echo "append to file as user without caps a 2nd time"
-_runas -u $uid $tmp.append
-
-echo "ls -P on file"
-ls -P $file | _testfilter
-
-echo "cat file"
-echo "----"
+echo "**** Verifying that appending to file doesn't clear other xattrs ****"
+setcap cap_chown+ep $file
+$SETFATTR_PROG -n trusted.name -v value $file
+echo data2 >> $file
cat $file
-echo "----"
-
-echo "only let root write to file"
-chmod 700 $file
-chown root $file
-
-echo "as non-root try to append to file"
-_runas -u $uid $tmp.append 2>&1 | _filefilter
-
-echo "restore perms on file"
-chmod 777 $file
+$GETFATTR_PROG -m '^trusted\.*' --absolute-names $file | filefilter
-echo "set a root EA on file"
-${ATTR_PROG} -R -s test -V testval $file | _filefilter
-
-echo "list EA on file"
-${ATTR_PROG} -R -l $file | _filefilter
-
-echo "as non-root try to append to file"
-_runas -u $uid $tmp.append 2>&1 | _filefilter
-
-echo "list EA on file"
-${ATTR_PROG} -R -l $file | _filefilter
-
-chown $uid $file
+echo "**** Verifying that chmod doesn't affect open file descriptors ****"
+rm -f $file
+touch $file
+chown $qa_user $file
chmod ugo+w $TEST_DIR
-echo "as non-root call writemod"
-_runas -u $uid src/writemod $file 2>&1 | _filefilter
-
-echo "cat file"
-echo "----"
+su $qa_user -c "src/writemod $file" | filefilter
cat $file
-echo "----"
# success, all done
status=0
diff --git a/tests/generic/093.out b/tests/generic/093.out
index 0113a48ca00c2637080cbaa3bcf9bb5cc90dd473..cb29153ebfb94b066e2c1c77eebb4a1c097dbd0d 100644
GIT binary patch
literal 372
zcma)&y-vh15QKX_#po!IKtlW!5l9p~0?oB(&)#55N!D6#F5KH=$GVOJ7b{z1&o|@G
z56EhHHF#w*4me%#`1<19U0pb`rty-NZ&)M)<;+XikAg8x3_mexfu~HTG$l)1&|bP-
zeQ&~-kFqWIoLwNJr~f(!;j-M;T#W#+$ci5_tF#@^&Dwl+H+z`3eLB;%)FKZH&HOja
z$5{fd02)X32C3D0r@+N)$|hG-mqf8?GRC2GJ77x|F${xKp5@HQtaE{M6W6br)Q{ty
JE2g$rcE3cCe3<|M
literal 917
zcmb_b!A=4(5cS-znC#Vn1`iuaJP;(&i=vWvAcU0NA={+eZrWK0fA6$a2m+#sd+JQ5
zGw;25`!WFAQqvL?4kcj;iw#`g-UvaqEh<<ljiRUu*?=`E(jGeFZ8RCZP3|9GulP+j
z6vI?%eFwwAcs_i1et)`bW<oX%ni9yy1|U5+Yf1dQQ6VW|=<p{>Nm9hq;eghogSDcH
z*#V>X;>g=wgL6=haX1(O5_*BAs_`th*-1P*P}b-TXr!nXteqnK(onF5#+pvh5y)*q
zeqRL9P4Toh>qpJ{EQ2vzo)+DQF}hlLuXwK|8il2B=*c>ShHw0K!=4eygki*P`E<d6
z$f-rkkTT+D8HBQc0&=zxr&m(92uthIbP=jJC$#beKQ*eD+lel}p#5*{3-)mmy|$&W
s?BGZytsx6m&!WK~&vRC;wyW>LZ8t_03lV>$J^xk;_{QNya`JBRANmR_wg3PC
diff --git a/tests/generic/group b/tests/generic/group
index e626820c..d93aa06d 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -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
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 02/15] tests: port generic/097 to Linux
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
2017-07-21 4:38 ` [PATCH v2 01/15] tests: port generic/093 to Linux Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 03/15] tests: port xfs/095 " Eric Biggers
` (13 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
This IRIX-specific test did some basic testing of extended attributes.
Port it to Linux; this mainly involved updating it to use the 'getfattr'
and 'setfattr' programs instead 'attr'. Note that although 'attr' is
available on Linux, it's mainly for IRIX compatibility, the man page
recommends against using it on non-XFS filesystems, and it doesn't
support listing user xattrs only. (In the last point it actually
differs from IRIX 'attr', but probably no one cares anymore.) getfattr
also sorts its output by xattr name, so its output will be the same on
all filesystems unlike 'attr -l'.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
.gitignore | 1 -
tests/generic/097 | 253 ++++++++++++++++++++--------------------------
tests/generic/097.out | 177 ++++++++++++++++++++++++++++++++
tests/generic/097.out.udf | 132 ------------------------
tests/generic/097.out.xfs | 132 ------------------------
tests/generic/group | 2 +-
6 files changed, 287 insertions(+), 410 deletions(-)
create mode 100644 tests/generic/097.out
delete mode 100644 tests/generic/097.out.udf
delete mode 100644 tests/generic/097.out.xfs
diff --git a/.gitignore b/.gitignore
index 1e994889..c0736486 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/tests/generic/097 b/tests/generic/097
index 637c73b7..13abe9e3 100755
--- a/tests/generic/097
+++ b/tests/generic/097
@@ -10,6 +10,7 @@
#
#-----------------------------------------------------------------------
# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved.
+# Copyright (c) 2017 Google, Inc. All Rights Reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -27,7 +28,6 @@
#-----------------------------------------------------------------------
#
-seqfull=$0
seq=`basename $0`
seqres=$RESULT_DIR/$seq
echo "QA output created by $seq"
@@ -35,215 +35,180 @@ echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
status=1 # failure is the default!
-TARGET_DIR=
trap "_cleanup; exit \$status" 0 1 2 3 15
+file=$TEST_DIR/foo
+
_cleanup()
{
- rm -f $tmp.*
- cd $TARGET_DIR
- rm -f foo
+ rm -f $tmp.* $file
+}
+
+getfattr()
+{
+ $GETFATTR_PROG --absolute-names "$@" |& _filter_test_dir
}
-_umount_and_mount()
+setfattr()
{
- cd /
- umount $TARGET_DIR
- if [ "$FSTYP" == "xfs" ]; then
- _test_mount
- else
- _scratch_mount
- fi
-
- cd $TARGET_DIR
+ $SETFATTR_PROG "$@" |& _filter_test_dir
}
# get standard environment, filters and checks
. ./common/rc
+. ./common/attr
. ./common/filter
-# link correct .out file
-# This is done bacause udf and xfs print attrs in different orders.
-rm -rf $seqfull.out
-if [ "$FSTYP" == "xfs" ]; then
- ln -s $seq.out.xfs $seqfull.out
-else
- ln -s $seq.out.udf $seqfull.out
-fi
-
# real QA test starts here
_supported_fs generic
-_supported_os IRIX
+_supported_os Linux
_require_test
-_require_scratch
_require_attrs
-TARGET_DIR=$SCRATCH_MNT
-[ "$FSTYP" == "xfs" ] && TARGET_DIR=$TEST_DIR
-cd $TARGET_DIR
-
-echo "create file foo"
-rm -f foo
-touch foo
-
-echo "should be no EAs for foo:"
-${ATTR_PROG} -l foo
-
-echo "set EA <noise,woof>:"
-${ATTR_PROG} -s noise -V woof foo
-
-echo "set EA <colour,blue>:"
-${ATTR_PROG} -s colour -V blue foo
-
-echo "set EA <size,small>:"
-${ATTR_PROG} -s size -V small foo
-
-echo "list the EAs for foo: noise, colour, size"
-${ATTR_PROG} -l foo
+echo -e "\ncreate file foo"
+rm -f $file
+touch $file
-echo "check the list again for foo"
-${ATTR_PROG} -l foo
+echo -e "\nshould be no EAs for foo:"
+getfattr -d $file
-echo "unmount the FS and see if EAs are persistent"
-_umount_and_mount
+echo -e "\nset EA <noise,woof>:"
+setfattr -n user.noise -v woof $file
-echo "check the list again for foo after umount/mount"
-${ATTR_PROG} -l foo
+echo -e "\nset EA <colour,blue>:"
+setfattr -n user.colour -v blue $file
-echo "get the value of the noise EA"
-${ATTR_PROG} -g noise foo
+echo -e "\nset EA <size,small>:"
+setfattr -n user.size -v small $file
-echo "get the value of the colour EA which was removed earlier"
-${ATTR_PROG} -g colour foo
+echo -e "\nlist the EAs for foo: noise, colour, size"
+getfattr -d $file
-echo "get the value of the size EA"
-${ATTR_PROG} -g size foo
+echo -e "\ncheck the list again for foo"
+getfattr -d $file
-echo "remove the colour EA on foo"
-${ATTR_PROG} -r colour foo
+echo -e "\nunmount the FS and see if EAs are persistent"
+_test_cycle_mount
-echo "list EAs for foo: noise, size"
-${ATTR_PROG} -l foo
+echo -e "\ncheck the list again for foo after umount/mount"
+getfattr -d $file
-echo "get the value of the noise EA"
-${ATTR_PROG} -g noise foo
+echo -e "\nremove the colour EA on foo"
+setfattr -x user.colour $file
-echo "get the value of the colour EA which was removed earlier"
-${ATTR_PROG} -g colour foo
+echo -e "\nlist EAs for foo: noise, size"
+getfattr -d $file
-echo "get the value of the size EA"
-${ATTR_PROG} -g size foo
+echo -e "\nget the value of the noise EA"
+getfattr -n user.noise $file
-echo "list all the EAs again: noise, size"
-${ATTR_PROG} -l foo
+echo -e "\nget the value of the colour EA which was removed earlier"
+getfattr -n user.colour $file
-echo "change the value of the size EA from small to huge"
-${ATTR_PROG} -s size -V huge foo
+echo -e "\nget the value of the size EA"
+getfattr -n user.size $file
-echo "get the size EA which should now have value huge"
-${ATTR_PROG} -g size foo
+echo -e "\nlist all the EAs again: noise, size"
+getfattr -d $file
-echo "list EAs: noise, size"
-${ATTR_PROG} -l foo
+echo -e "\nchange the value of the size EA from small to huge"
+setfattr -n user.size -v huge $file
-echo "remove the size EA from foo"
-${ATTR_PROG} -r size foo
+echo -e "\nget the size EA which should now have value huge"
+getfattr -n user.size $file
-echo "list EAs: noise (size EA has been removed)"
-${ATTR_PROG} -l foo
+echo -e "\nlist EAs: noise, size"
+getfattr -d $file
-echo "get the noise EA: woof"
-${ATTR_PROG} -g noise foo
+echo -e "\nremove the size EA from foo"
+setfattr -x user.size $file
-echo "try removing non-existent EA named woof"
-${ATTR_PROG} -r woof foo
+echo -e "\nlist EAs: noise (size EA has been removed)"
+getfattr -d $file
-echo "try removing already removed EA size"
-${ATTR_PROG} -r size foo
+echo -e "\ntry removing non-existent EA named woof"
+setfattr -x user.woof $file
-echo "list EAs: noise"
-${ATTR_PROG} -l foo
+echo -e "\ntry removing already removed EA size"
+setfattr -x user.size $file
-echo "try removing already removed EA colour"
-${ATTR_PROG} -r colour foo
+echo -e "\nlist EAs: noise"
+getfattr -d $file
-echo "list EAs: noise"
-${ATTR_PROG} -l foo
+echo -e "\ntry removing already removed EA colour"
+setfattr -x user.colour $file
-echo "remove remaining EA noise"
-${ATTR_PROG} -r noise foo
+echo -e "\nlist EAs: noise"
+getfattr -d $file
-echo "list EAs: should be no EAs left now"
-${ATTR_PROG} -l foo
+echo -e "\nremove remaining EA noise"
+setfattr -x user.noise $file
-echo "unmount the FS and see if EAs are persistent"
-_umount_and_mount
+echo -e "\nlist EAs: should be no EAs left now"
+getfattr -d $file
-echo "list EAs: should still be no EAs left"
-${ATTR_PROG} -l foo
+echo -e "\nunmount the FS and see if EAs are persistent"
+_test_cycle_mount
-echo ""
-echo "*** Test out the root namespace ***"
-echo ""
+echo -e "\nlist EAs: should still be no EAs left"
+getfattr -d $file
-echo "set EA <root:colour,marone>:"
-${ATTR_PROG} -R -s colour -V marone foo
+echo -e "\n*** Test out the trusted namespace ***"
-echo "set EA <user:colour,beige>:"
-${ATTR_PROG} -s colour -V beige foo
+echo -e "\nset EA <trusted:colour,marone>:"
+setfattr -n trusted.colour -v marone $file
-echo "set EA <user:vomit,pizza>:"
-${ATTR_PROG} -s vomit -V pizza foo
+echo -e "\nset EA <user:colour,beige>:"
+setfattr -n user.colour -v beige $file
-echo "set EA <root:noise,whack>:"
-${ATTR_PROG} -R -s noise -V whack foo
+echo -e "\nset EA <user:vomit,pizza>:"
+setfattr -n user.vomit -v pizza $file
-echo "list root EAs: <root:colour,noise>:"
-${ATTR_PROG} -R -l foo
+echo -e "\nset EA <trusted:noise,whack>:"
+setfattr -n trusted.noise -v whack $file
-echo "list user EAs: <user:colour,vomit>:"
-${ATTR_PROG} -l foo
+echo -e "\nlist trusted EAs: <trusted:colour,noise>:"
+getfattr -d -m '^trusted\.' $file
-echo "get root EA colour: marone"
-${ATTR_PROG} -R -g colour foo
+echo -e "\nlist user EAs: <user:colour,vomit>:"
+getfattr -d $file
-echo "get root EA noise: whack"
-${ATTR_PROG} -R -g noise foo
+echo -e "\nget trusted EA colour: marone"
+getfattr -n trusted.colour $file
-echo "get root EA vomit which is a user EA => find nothing"
-${ATTR_PROG} -R -g vomit foo
+echo -e "\nget trusted EA noise: whack"
+getfattr -n trusted.noise $file
-echo ""
-echo "unmount the FS and see if EAs are persistent"
-echo ""
-_umount_and_mount
+echo -e "\nget trusted EA vomit which is a user EA => find nothing"
+getfattr -n trusted.vomit $file
-echo "get root EA colour: marone"
-${ATTR_PROG} -R -g colour foo
+echo -e "\nunmount the FS and see if EAs are persistent"
+_test_cycle_mount
-echo "get root EA noise: whack"
-${ATTR_PROG} -R -g noise foo
+echo -e "\nget trusted EA colour: marone"
+getfattr -n trusted.colour $file
-echo "get user EA vomit: pizza"
-${ATTR_PROG} -g vomit foo
+echo -e "\nget trusted EA noise: whack"
+getfattr -n trusted.noise $file
-echo "remove the root colour EA"
-${ATTR_PROG} -R -r colour foo
+echo -e "\nget user EA vomit: pizza"
+getfattr -n user.vomit $file
-echo "list root EAs: <root:noise>:"
-${ATTR_PROG} -R -l foo
+echo -e "\nremove the trusted colour EA"
+setfattr -x trusted.colour $file
-echo "list user EAs: <user:colour,vomit>:"
-${ATTR_PROG} -l foo
+echo -e "\nlist trusted EAs: <trusted:noise>:"
+getfattr -d -m '^trusted\.' $file
-echo "remove the final root EA noise"
-${ATTR_PROG} -R -r noise foo
+echo -e "\nlist user EAs: <user:colour,vomit>:"
+getfattr -d $file
-echo "list root EAs: none"
-${ATTR_PROG} -R -l foo
+echo -e "\nremove the final trusted EA noise"
+setfattr -x trusted.noise $file
-cd /
+echo -e "\nlist trusted EAs: none"
+getfattr -d -m '^trusted\.' $file
# success, all done
status=0
diff --git a/tests/generic/097.out b/tests/generic/097.out
new file mode 100644
index 00000000..948d57b6
--- /dev/null
+++ b/tests/generic/097.out
@@ -0,0 +1,177 @@
+QA output created by 097
+
+create file foo
+
+should be no EAs for foo:
+
+set EA <noise,woof>:
+
+set EA <colour,blue>:
+
+set EA <size,small>:
+
+list the EAs for foo: noise, colour, size
+# file: TEST_DIR/foo
+user.colour="blue"
+user.noise="woof"
+user.size="small"
+
+
+check the list again for foo
+# file: TEST_DIR/foo
+user.colour="blue"
+user.noise="woof"
+user.size="small"
+
+
+unmount the FS and see if EAs are persistent
+
+check the list again for foo after umount/mount
+# file: TEST_DIR/foo
+user.colour="blue"
+user.noise="woof"
+user.size="small"
+
+
+remove the colour EA on foo
+
+list EAs for foo: noise, size
+# file: TEST_DIR/foo
+user.noise="woof"
+user.size="small"
+
+
+get the value of the noise EA
+# file: TEST_DIR/foo
+user.noise="woof"
+
+
+get the value of the colour EA which was removed earlier
+TEST_DIR/foo: user.colour: No such attribute
+
+get the value of the size EA
+# file: TEST_DIR/foo
+user.size="small"
+
+
+list all the EAs again: noise, size
+# file: TEST_DIR/foo
+user.noise="woof"
+user.size="small"
+
+
+change the value of the size EA from small to huge
+
+get the size EA which should now have value huge
+# file: TEST_DIR/foo
+user.size="huge"
+
+
+list EAs: noise, size
+# file: TEST_DIR/foo
+user.noise="woof"
+user.size="huge"
+
+
+remove the size EA from foo
+
+list EAs: noise (size EA has been removed)
+# file: TEST_DIR/foo
+user.noise="woof"
+
+
+try removing non-existent EA named woof
+setfattr: TEST_DIR/foo: No such attribute
+
+try removing already removed EA size
+setfattr: TEST_DIR/foo: No such attribute
+
+list EAs: noise
+# file: TEST_DIR/foo
+user.noise="woof"
+
+
+try removing already removed EA colour
+setfattr: TEST_DIR/foo: No such attribute
+
+list EAs: noise
+# file: TEST_DIR/foo
+user.noise="woof"
+
+
+remove remaining EA noise
+
+list EAs: should be no EAs left now
+
+unmount the FS and see if EAs are persistent
+
+list EAs: should still be no EAs left
+
+*** Test out the trusted namespace ***
+
+set EA <trusted:colour,marone>:
+
+set EA <user:colour,beige>:
+
+set EA <user:vomit,pizza>:
+
+set EA <trusted:noise,whack>:
+
+list trusted EAs: <trusted:colour,noise>:
+# file: TEST_DIR/foo
+trusted.colour="marone"
+trusted.noise="whack"
+
+
+list user EAs: <user:colour,vomit>:
+# file: TEST_DIR/foo
+user.colour="beige"
+user.vomit="pizza"
+
+
+get trusted EA colour: marone
+# file: TEST_DIR/foo
+trusted.colour="marone"
+
+
+get trusted EA noise: whack
+# file: TEST_DIR/foo
+trusted.noise="whack"
+
+
+get trusted EA vomit which is a user EA => find nothing
+TEST_DIR/foo: trusted.vomit: No such attribute
+
+unmount the FS and see if EAs are persistent
+
+get trusted EA colour: marone
+# file: TEST_DIR/foo
+trusted.colour="marone"
+
+
+get trusted EA noise: whack
+# file: TEST_DIR/foo
+trusted.noise="whack"
+
+
+get user EA vomit: pizza
+# file: TEST_DIR/foo
+user.vomit="pizza"
+
+
+remove the trusted colour EA
+
+list trusted EAs: <trusted:noise>:
+# file: TEST_DIR/foo
+trusted.noise="whack"
+
+
+list user EAs: <user:colour,vomit>:
+# file: TEST_DIR/foo
+user.colour="beige"
+user.vomit="pizza"
+
+
+remove the final trusted EA noise
+
+list trusted EAs: none
diff --git a/tests/generic/097.out.udf b/tests/generic/097.out.udf
deleted file mode 100644
index 1d36ff76..00000000
diff --git a/tests/generic/097.out.xfs b/tests/generic/097.out.xfs
deleted file mode 100644
index 0024bf23..00000000
diff --git a/tests/generic/group b/tests/generic/group
index d93aa06d..20c278cc 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -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
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 03/15] tests: port xfs/095 to Linux
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
2017-07-21 4:38 ` [PATCH v2 01/15] tests: port generic/093 to Linux Eric Biggers
2017-07-21 4:38 ` [PATCH v2 02/15] tests: port generic/097 " Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 04/15] tests: remove udf/098 Eric Biggers
` (12 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
This tests upgrading the XFS log to v2. Switch from the IRIX xfs_chver
program to xfs_db.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
tests/xfs/095 | 11 +++++------
tests/xfs/095.out | 3 +--
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/tests/xfs/095 b/tests/xfs/095
index d1373586..1f5a51f6 100755
--- a/tests/xfs/095
+++ b/tests/xfs/095
@@ -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
diff --git a/tests/xfs/095.out b/tests/xfs/095.out
index 36ffdecc..378876d8 100644
--- a/tests/xfs/095.out
+++ b/tests/xfs/095.out
@@ -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
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 04/15] tests: remove udf/098
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (2 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 03/15] tests: port xfs/095 " Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 05/15] tests: remove udf/101 Eric Biggers
` (11 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
udf/098 was an IRIX and UDF-specific test which tested xattrs. But the
Linux UDF driver doesn't support xattrs, and even if it did there are
already generic xattr tests --- including now generic/097 which is
basically the same test. So just delete udf/098.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
tests/udf/098 | 274 ---------
tests/udf/098.out | 1594 -----------------------------------------------------
tests/udf/group | 1 -
3 files changed, 1869 deletions(-)
delete mode 100755 tests/udf/098
delete mode 100644 tests/udf/098.out
diff --git a/tests/udf/098 b/tests/udf/098
deleted file mode 100755
index 09792a76..00000000
diff --git a/tests/udf/098.out b/tests/udf/098.out
deleted file mode 100644
index 63772a0a..00000000
diff --git a/tests/udf/group b/tests/udf/group
index 24f682cc..f4372e09 100644
--- a/tests/udf/group
+++ b/tests/udf/group
@@ -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
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 05/15] tests: remove udf/101
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (3 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 04/15] tests: remove udf/098 Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 06/15] tests: remove xfs/114 and xfs/115 Eric Biggers
` (10 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
This IRIX and UDF-specific test essentially just created a UDF
filesystem with a specific size. This isn't really useful because there
already are many generic tests that do _scratch_mkfs_sized. So just
delete the test rather than trying to port it to Linux.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
tests/udf/101 | 62 -------------------------------------------------------
tests/udf/101.out | 19 -----------------
tests/udf/group | 1 -
3 files changed, 82 deletions(-)
delete mode 100755 tests/udf/101
delete mode 100644 tests/udf/101.out
diff --git a/tests/udf/101 b/tests/udf/101
deleted file mode 100755
index 9609c072..00000000
diff --git a/tests/udf/101.out b/tests/udf/101.out
deleted file mode 100644
index 1ca59a8c..00000000
diff --git a/tests/udf/group b/tests/udf/group
index f4372e09..6680da44 100644
--- a/tests/udf/group
+++ b/tests/udf/group
@@ -3,5 +3,4 @@
# - do not start group names with a digit
# - comment line before each group is "new" description
#
-101 udf
102 udf
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 06/15] tests: remove xfs/114 and xfs/115
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (4 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 05/15] tests: remove udf/101 Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 07/15] tests: remove xfs/057 and xfs/058 Eric Biggers
` (9 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
These two IRIX and XFS-specific tests tested the "parent pointer"
feature which is not implemented by XFS on Linux. Just remove them.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
tests/xfs/114 | 340 --------------------------------------------------
tests/xfs/114.out | 365 ------------------------------------------------------
tests/xfs/115 | 257 --------------------------------------
tests/xfs/115.out | 118 ------------------
tests/xfs/group | 2 -
5 files changed, 1082 deletions(-)
delete mode 100755 tests/xfs/114
delete mode 100644 tests/xfs/114.out
delete mode 100755 tests/xfs/115
delete mode 100644 tests/xfs/115.out
diff --git a/tests/xfs/114 b/tests/xfs/114
deleted file mode 100755
index 24474f74..00000000
diff --git a/tests/xfs/114.out b/tests/xfs/114.out
deleted file mode 100644
index a36396e2..00000000
diff --git a/tests/xfs/115 b/tests/xfs/115
deleted file mode 100755
index cf17388d..00000000
diff --git a/tests/xfs/115.out b/tests/xfs/115.out
deleted file mode 100644
index 44d8e55e..00000000
diff --git a/tests/xfs/group b/tests/xfs/group
index ffdb0615..e7de18dd 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -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
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 07/15] tests: remove xfs/057 and xfs/058
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (5 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 06/15] tests: remove xfs/114 and xfs/115 Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 08/15] tests: remove generic/099 Eric Biggers
` (8 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
These two IRIX and XFS-specific tests were just placeholders which
didn't actually test anything. It also seems they were meant to use the
acl_get and acl_test programs, but those weren't even being compiled.
Get rid of all this unused stuff.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
src/acl_get.c | 148 ------------------------------
src/acl_test.c | 264 ------------------------------------------------------
tests/xfs/057 | 47 ----------
tests/xfs/057.out | 34 -------
tests/xfs/058 | 46 ----------
tests/xfs/058.out | 243 -------------------------------------------------
tests/xfs/group | 2 -
7 files changed, 784 deletions(-)
delete mode 100644 src/acl_get.c
delete mode 100644 src/acl_test.c
delete mode 100755 tests/xfs/057
delete mode 100644 tests/xfs/057.out
delete mode 100755 tests/xfs/058
delete mode 100644 tests/xfs/058.out
diff --git a/src/acl_get.c b/src/acl_get.c
deleted file mode 100644
index 3701dd02..00000000
diff --git a/src/acl_test.c b/src/acl_test.c
deleted file mode 100644
index a060b6c9..00000000
diff --git a/tests/xfs/057 b/tests/xfs/057
deleted file mode 100755
index a3fe9c36..00000000
diff --git a/tests/xfs/057.out b/tests/xfs/057.out
deleted file mode 100644
index 7e38ab37..00000000
diff --git a/tests/xfs/058 b/tests/xfs/058
deleted file mode 100755
index 89c441aa..00000000
diff --git a/tests/xfs/058.out b/tests/xfs/058.out
deleted file mode 100644
index 58a426b5..00000000
diff --git a/tests/xfs/group b/tests/xfs/group
index e7de18dd..fd634275 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -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
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 08/15] tests: remove generic/099
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (6 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 07/15] tests: remove xfs/057 and xfs/058 Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 09/15] tests: make shared/051 a generic test Eric Biggers
` (7 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
This IRIX-specific ACL test was nearly identical to shared/051, which
has been better maintained and will be made a generic test in the next
commit. Therefore, remove the existing generic/099.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
common/attr | 12 --
tests/generic/099 | 331 --------------------------------------------------
tests/generic/099.out | 215 --------------------------------
tests/generic/group | 1 -
4 files changed, 559 deletions(-)
delete mode 100755 tests/generic/099
delete mode 100644 tests/generic/099.out
diff --git a/common/attr b/common/attr
index c840ce42..fae367f0 100644
--- a/common/attr
+++ b/common/attr
@@ -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()
diff --git a/tests/generic/099 b/tests/generic/099
deleted file mode 100755
index 4af588c8..00000000
diff --git a/tests/generic/099.out b/tests/generic/099.out
deleted file mode 100644
index 3f4f663f..00000000
diff --git a/tests/generic/group b/tests/generic/group
index 20c278cc..93a7378b 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -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
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 09/15] tests: make shared/051 a generic test
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (7 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 08/15] tests: remove generic/099 Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 10/15] README: remove IRIX-specific documentation Eric Biggers
` (6 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
The ACL test shared/051 was very similar to generic/099 which was not
being run and was just removed; most likely the script was copy+pasted
at some point. Since shared/051 has been getting maintained+run and is
not really XFS and UDF-specific, move it to generic, reusing the old
number of 099. One change was required for it to work on other
filesystems: the output of 'find' must be sorted.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
tests/{shared/051 => generic/099} | 8 ++++----
tests/{shared/051.out => generic/099.out} | 18 +++++++++---------
tests/generic/group | 1 +
tests/shared/group | 1 -
4 files changed, 14 insertions(+), 14 deletions(-)
rename tests/{shared/051 => generic/099} (98%)
rename tests/{shared/051.out => generic/099.out} (99%)
diff --git a/tests/shared/051 b/tests/generic/099
similarity index 98%
rename from tests/shared/051
rename to tests/generic/099
index 298838e7..f65c53f1 100755
--- a/tests/shared/051
+++ b/tests/generic/099
@@ -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
#-------------------------------------------------------
diff --git a/tests/shared/051.out b/tests/generic/099.out
similarity index 99%
rename from tests/shared/051.out
rename to tests/generic/099.out
index 2b5220f7..94172420 100644
--- a/tests/shared/051.out
+++ b/tests/generic/099.out
@@ -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
diff --git a/tests/generic/group b/tests/generic/group
index 93a7378b..ee9a7539 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -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
diff --git a/tests/shared/group b/tests/shared/group
index fab93315..b3663a03 100644
--- a/tests/shared/group
+++ b/tests/shared/group
@@ -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
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 10/15] README: remove IRIX-specific documentation
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (8 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 09/15] tests: make shared/051 a generic test Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 11/15] tests: remove IRIX support from tests also supported on Linux Eric Biggers
` (5 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
xfstests is no longer supported on IRIX, so remove the IRIX-specific
instructions for building and running xfstests.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
README | 51 ++++++++++++++++++++++-----------------------------
1 file changed, 22 insertions(+), 29 deletions(-)
diff --git a/README b/README
index 11bf6a94..9456fa76 100644
--- a/README
+++ b/README
@@ -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.
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 11/15] tests: remove IRIX support from tests also supported on Linux
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (9 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 10/15] README: remove IRIX-specific documentation Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 12/15] tests: clean up per-OS output files Eric Biggers
` (4 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
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>
---
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
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 <<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
diff --git a/tests/xfs/018.cfg b/tests/xfs/018.cfg
index 7ffdfc07..7fd51a7d 100644
--- a/tests/xfs/018.cfg
+++ b/tests/xfs/018.cfg
@@ -1,2 +1 @@
-irix: irix
linux: linux
diff --git a/tests/xfs/018.op.irix b/tests/xfs/018.op.irix
deleted file mode 100644
index e3d3cd32..00000000
diff --git a/tests/xfs/019 b/tests/xfs/019
index 4d2fdeda..3e4f1692 100755
--- a/tests/xfs/019
+++ b/tests/xfs/019
@@ -63,7 +63,7 @@ _filter_stat()
# real QA test starts here
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_scratch
diff --git a/tests/xfs/022 b/tests/xfs/022
index b2b6142c..1cd6d28e 100755
--- a/tests/xfs/022
+++ b/tests/xfs/022
@@ -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
diff --git a/tests/xfs/022.cfg b/tests/xfs/022.cfg
index 7ffdfc07..7fd51a7d 100644
--- a/tests/xfs/022.cfg
+++ b/tests/xfs/022.cfg
@@ -1,2 +1 @@
-irix: irix
linux: linux
diff --git a/tests/xfs/022.out.irix b/tests/xfs/022.out.irix
deleted file mode 100644
index f72876aa..00000000
diff --git a/tests/xfs/023 b/tests/xfs/023
index 9a899a86..d304384b 100755
--- a/tests/xfs/023
+++ b/tests/xfs/023
@@ -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
diff --git a/tests/xfs/023.cfg b/tests/xfs/023.cfg
index 7ffdfc07..7fd51a7d 100644
--- a/tests/xfs/023.cfg
+++ b/tests/xfs/023.cfg
@@ -1,2 +1 @@
-irix: irix
linux: linux
diff --git a/tests/xfs/023.out.irix b/tests/xfs/023.out.irix
deleted file mode 100644
index 97845dd4..00000000
diff --git a/tests/xfs/026 b/tests/xfs/026
index 4cd77896..2111190b 100755
--- a/tests/xfs/026
+++ b/tests/xfs/026
@@ -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
diff --git a/tests/xfs/027 b/tests/xfs/027
index 10056838..58a62482 100755
--- a/tests/xfs/027
+++ b/tests/xfs/027
@@ -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
diff --git a/tests/xfs/028 b/tests/xfs/028
index e6348902..19e09603 100755
--- a/tests/xfs/028
+++ b/tests/xfs/028
@@ -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
diff --git a/tests/xfs/030 b/tests/xfs/030
index 15f41edd..4d8d7d67 100755
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -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
diff --git a/tests/xfs/030.cfg b/tests/xfs/030.cfg
index 7ffdfc07..7fd51a7d 100644
--- a/tests/xfs/030.cfg
+++ b/tests/xfs/030.cfg
@@ -1,2 +1 @@
-irix: irix
linux: linux
diff --git a/tests/xfs/030.out.irix b/tests/xfs/030.out.irix
deleted file mode 100644
index 56adfd05..00000000
diff --git a/tests/xfs/031 b/tests/xfs/031
index 59d68c31..678c3249 100755
--- a/tests/xfs/031
+++ b/tests/xfs/031
@@ -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
diff --git a/tests/xfs/031.cfg b/tests/xfs/031.cfg
index 7ffdfc07..7fd51a7d 100644
--- a/tests/xfs/031.cfg
+++ b/tests/xfs/031.cfg
@@ -1,2 +1 @@
-irix: irix
linux: linux
diff --git a/tests/xfs/031.out.irix b/tests/xfs/031.out.irix
deleted file mode 100644
index 32e902d4..00000000
diff --git a/tests/xfs/032 b/tests/xfs/032
index 6d644ad8..a6923b08 100755
--- a/tests/xfs/032
+++ b/tests/xfs/032
@@ -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"
diff --git a/tests/xfs/033 b/tests/xfs/033
index 45caf081..a6f93f29 100755
--- a/tests/xfs/033
+++ b/tests/xfs/033
@@ -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
diff --git a/tests/xfs/033.cfg b/tests/xfs/033.cfg
index 88e90e57..768ca9e0 100644
--- a/tests/xfs/033.cfg
+++ b/tests/xfs/033.cfg
@@ -1,3 +1,2 @@
-irix: irix
linux,crc: crc.linux
linux: linux
diff --git a/tests/xfs/033.out.irix b/tests/xfs/033.out.irix
deleted file mode 100644
index 59601179..00000000
diff --git a/tests/xfs/035 b/tests/xfs/035
index 25f2f697..6b6c86b7 100755
--- a/tests/xfs/035
+++ b/tests/xfs/035
@@ -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
diff --git a/tests/xfs/035.cfg b/tests/xfs/035.cfg
index 7ffdfc07..7fd51a7d 100644
--- a/tests/xfs/035.cfg
+++ b/tests/xfs/035.cfg
@@ -1,2 +1 @@
-irix: irix
linux: linux
diff --git a/tests/xfs/035.out.irix b/tests/xfs/035.out.irix
deleted file mode 100644
index 653f950a..00000000
diff --git a/tests/xfs/036 b/tests/xfs/036
index 280d0366..c65523f5 100755
--- a/tests/xfs/036
+++ b/tests/xfs/036
@@ -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
diff --git a/tests/xfs/036.cfg b/tests/xfs/036.cfg
index 7ffdfc07..7fd51a7d 100644
--- a/tests/xfs/036.cfg
+++ b/tests/xfs/036.cfg
@@ -1,2 +1 @@
-irix: irix
linux: linux
diff --git a/tests/xfs/036.out.irix b/tests/xfs/036.out.irix
deleted file mode 100644
index 6680373f..00000000
diff --git a/tests/xfs/039 b/tests/xfs/039
index 2f765b82..62735906 100755
--- a/tests/xfs/039
+++ b/tests/xfs/039
@@ -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
diff --git a/tests/xfs/039.cfg b/tests/xfs/039.cfg
index 7ffdfc07..7fd51a7d 100644
--- a/tests/xfs/039.cfg
+++ b/tests/xfs/039.cfg
@@ -1,2 +1 @@
-irix: irix
linux: linux
diff --git a/tests/xfs/039.out.irix b/tests/xfs/039.out.irix
deleted file mode 100644
index 9bd188fe..00000000
diff --git a/tests/xfs/041 b/tests/xfs/041
index 50385288..1b9500f7 100755
--- a/tests/xfs/041
+++ b/tests/xfs/041
@@ -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
diff --git a/tests/xfs/042 b/tests/xfs/042
index ba5eed32..182cebc3 100755
--- a/tests/xfs/042
+++ b/tests/xfs/042
@@ -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
diff --git a/tests/xfs/043 b/tests/xfs/043
index 59eeff6e..caca73da 100755
--- a/tests/xfs/043
+++ b/tests/xfs/043
@@ -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
diff --git a/tests/xfs/043.cfg b/tests/xfs/043.cfg
index 7ffdfc07..7fd51a7d 100644
--- a/tests/xfs/043.cfg
+++ b/tests/xfs/043.cfg
@@ -1,2 +1 @@
-irix: irix
linux: linux
diff --git a/tests/xfs/043.out.irix b/tests/xfs/043.out.irix
deleted file mode 100644
index 61c226cc..00000000
diff --git a/tests/xfs/046 b/tests/xfs/046
index 841c12b6..446a69dc 100755
--- a/tests/xfs/046
+++ b/tests/xfs/046
@@ -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
diff --git a/tests/xfs/047 b/tests/xfs/047
index d7c0dce0..6ade1678 100755
--- a/tests/xfs/047
+++ b/tests/xfs/047
@@ -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
diff --git a/tests/xfs/048 b/tests/xfs/048
index 3dd685f0..32dbc057 100755
--- a/tests/xfs/048
+++ b/tests/xfs/048
@@ -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
diff --git a/tests/xfs/050 b/tests/xfs/050
index 130df77e..ac7feb48 100755
--- a/tests/xfs/050
+++ b/tests/xfs/050
@@ -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"
diff --git a/tests/xfs/052 b/tests/xfs/052
index 56231f37..faad218e 100755
--- a/tests/xfs/052
+++ b/tests/xfs/052
@@ -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
diff --git a/tests/xfs/053 b/tests/xfs/053
index 80c244dd..353dda34 100755
--- a/tests/xfs/053
+++ b/tests/xfs/053
@@ -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
diff --git a/tests/xfs/055 b/tests/xfs/055
index 920ba288..383058a5 100755
--- a/tests/xfs/055
+++ b/tests/xfs/055
@@ -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
diff --git a/tests/xfs/055.out.irix b/tests/xfs/055.out.irix
deleted file mode 100644
index 8bff6e9c..00000000
diff --git a/tests/xfs/056 b/tests/xfs/056
index 7e2624a2..613539a7 100755
--- a/tests/xfs/056
+++ b/tests/xfs/056
@@ -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
diff --git a/tests/xfs/061 b/tests/xfs/061
index 2600f03d..8a4e254a 100755
--- a/tests/xfs/061
+++ b/tests/xfs/061
@@ -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)
diff --git a/tests/xfs/064 b/tests/xfs/064
index 410b4870..306e2cce 100755
--- a/tests/xfs/064
+++ b/tests/xfs/064
@@ -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
diff --git a/tests/xfs/065 b/tests/xfs/065
index 6b2139f3..b7da0b8c 100755
--- a/tests/xfs/065
+++ b/tests/xfs/065
@@ -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
diff --git a/tests/xfs/066 b/tests/xfs/066
index 736439b4..061ce2dd 100755
--- a/tests/xfs/066
+++ b/tests/xfs/066
@@ -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()
diff --git a/tests/xfs/071 b/tests/xfs/071
index cf69b66b..c214dd51 100755
--- a/tests/xfs/071
+++ b/tests/xfs/071
@@ -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"
diff --git a/tests/xfs/072 b/tests/xfs/072
index 43aa4211..5393cf8b 100755
--- a/tests/xfs/072
+++ b/tests/xfs/072
@@ -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"
diff --git a/tests/xfs/080 b/tests/xfs/080
index e0f5b1b9..20c4a72a 100755
--- a/tests/xfs/080
+++ b/tests/xfs/080
@@ -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
diff --git a/tests/xfs/081 b/tests/xfs/081
index 6f6f8256..b54c8d54 100755
--- a/tests/xfs/081
+++ b/tests/xfs/081
@@ -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
diff --git a/tests/xfs/082 b/tests/xfs/082
index 0c0b98af..f824d5ef 100755
--- a/tests/xfs/082
+++ b/tests/xfs/082
@@ -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
diff --git a/tests/xfs/082.cfg b/tests/xfs/082.cfg
index 7ffdfc07..7fd51a7d 100644
--- a/tests/xfs/082.cfg
+++ b/tests/xfs/082.cfg
@@ -1,2 +1 @@
-irix: irix
linux: linux
diff --git a/tests/xfs/082.op.irix b/tests/xfs/082.op.irix
deleted file mode 100644
index e3d3cd32..00000000
diff --git a/tests/xfs/084 b/tests/xfs/084
index 7aa193b5..6d20ef3a 100755
--- a/tests/xfs/084
+++ b/tests/xfs/084
@@ -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
diff --git a/tests/xfs/092 b/tests/xfs/092
index f195077d..5a693195 100755
--- a/tests/xfs/092
+++ b/tests/xfs/092
@@ -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
diff --git a/tests/xfs/094 b/tests/xfs/094
index bf9eb2f9..d3606f81 100755
--- a/tests/xfs/094
+++ b/tests/xfs/094
@@ -43,7 +43,7 @@ _cleanup()
# real QA test starts here
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_realtime
_require_scratch
diff --git a/tests/xfs/096 b/tests/xfs/096
index 64754b2a..a9451f43 100755
--- a/tests/xfs/096
+++ b/tests/xfs/096
@@ -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
diff --git a/tests/xfs/103 b/tests/xfs/103
index 48b8c59c..024416bd 100755
--- a/tests/xfs/103
+++ b/tests/xfs/103
@@ -64,7 +64,7 @@ _filter_noymlinks_flag()
}
# real QA test starts here
-_supported_os Linux IRIX
+_supported_os Linux
_supported_fs xfs
_require_scratch
diff --git a/tests/xfs/107 b/tests/xfs/107
index 2bd20a3d..7640bff3 100755
--- a/tests/xfs/107
+++ b/tests/xfs/107
@@ -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
diff --git a/tests/xfs/108 b/tests/xfs/108
index addb8e7d..86415366 100755
--- a/tests/xfs/108
+++ b/tests/xfs/108
@@ -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
diff --git a/tests/xfs/116 b/tests/xfs/116
index 1d13d15d..af2bcb99 100755
--- a/tests/xfs/116
+++ b/tests/xfs/116
@@ -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
diff --git a/tests/xfs/118 b/tests/xfs/118
index a5f5593f..fac3aa77 100755
--- a/tests/xfs/118
+++ b/tests/xfs/118
@@ -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"
diff --git a/tests/xfs/119 b/tests/xfs/119
index 156d5e4a..ad6db455 100755
--- a/tests/xfs/119
+++ b/tests/xfs/119
@@ -47,7 +47,7 @@ _cleanup()
# Modify as appropriate.
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_scratch
diff --git a/tests/xfs/121 b/tests/xfs/121
index d301808b..2f84a3c8 100755
--- a/tests/xfs/121
+++ b/tests/xfs/121
@@ -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
diff --git a/tests/xfs/136 b/tests/xfs/136
index 0177698a..cbba64f7 100755
--- a/tests/xfs/136
+++ b/tests/xfs/136
@@ -50,7 +50,7 @@ _cleanup()
# Modify as appropriate.
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_scratch
_require_attrs
diff --git a/tests/xfs/142 b/tests/xfs/142
index a1efcc23..8a11d8bc 100755
--- a/tests/xfs/142
+++ b/tests/xfs/142
@@ -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
diff --git a/tests/xfs/143 b/tests/xfs/143
index c389a2b8..4a3bd473 100755
--- a/tests/xfs/143
+++ b/tests/xfs/143
@@ -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
diff --git a/tests/xfs/144 b/tests/xfs/144
index 41041c4e..da3995e9 100755
--- a/tests/xfs/144
+++ b/tests/xfs/144
@@ -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
diff --git a/tests/xfs/145 b/tests/xfs/145
index 44b3e4ef..14a979b5 100755
--- a/tests/xfs/145
+++ b/tests/xfs/145
@@ -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
diff --git a/tests/xfs/146 b/tests/xfs/146
index f6cd3f30..ea448db2 100755
--- a/tests/xfs/146
+++ b/tests/xfs/146
@@ -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
diff --git a/tests/xfs/146.cfg b/tests/xfs/146.cfg
index 7ffdfc07..7fd51a7d 100644
--- a/tests/xfs/146.cfg
+++ b/tests/xfs/146.cfg
@@ -1,2 +1 @@
-irix: irix
linux: linux
diff --git a/tests/xfs/146.out.irix b/tests/xfs/146.out.irix
deleted file mode 100644
index 827be545..00000000
diff --git a/tests/xfs/147 b/tests/xfs/147
index 73ff7f9f..26b885c7 100755
--- a/tests/xfs/147
+++ b/tests/xfs/147
@@ -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
diff --git a/tests/xfs/148 b/tests/xfs/148
index 42c04810..89f6906d 100755
--- a/tests/xfs/148
+++ b/tests/xfs/148
@@ -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
diff --git a/tests/xfs/149 b/tests/xfs/149
index 1307d5c0..a72a5ba4 100755
--- a/tests/xfs/149
+++ b/tests/xfs/149
@@ -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
diff --git a/tests/xfs/150 b/tests/xfs/150
index f9e690a9..8ab2682d 100755
--- a/tests/xfs/150
+++ b/tests/xfs/150
@@ -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
diff --git a/tests/xfs/151 b/tests/xfs/151
index bba70944..982f10b4 100755
--- a/tests/xfs/151
+++ b/tests/xfs/151
@@ -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
diff --git a/tests/xfs/152 b/tests/xfs/152
index 72bdabf2..1a6473f2 100755
--- a/tests/xfs/152
+++ b/tests/xfs/152
@@ -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
diff --git a/tests/xfs/153 b/tests/xfs/153
index cac77228..4fd348d6 100755
--- a/tests/xfs/153
+++ b/tests/xfs/153
@@ -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
diff --git a/tests/xfs/154 b/tests/xfs/154
index 810a6ac1..398dd280 100755
--- a/tests/xfs/154
+++ b/tests/xfs/154
@@ -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
diff --git a/tests/xfs/155 b/tests/xfs/155
index 1a1631e2..6f5ebfe3 100755
--- a/tests/xfs/155
+++ b/tests/xfs/155
@@ -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
diff --git a/tests/xfs/156 b/tests/xfs/156
index d6e22b66..9e17e078 100755
--- a/tests/xfs/156
+++ b/tests/xfs/156
@@ -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
diff --git a/tests/xfs/157 b/tests/xfs/157
index bf655902..ac7b63b7 100755
--- a/tests/xfs/157
+++ b/tests/xfs/157
@@ -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
diff --git a/tests/xfs/158 b/tests/xfs/158
index 596f4c24..22710a12 100755
--- a/tests/xfs/158
+++ b/tests/xfs/158
@@ -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
diff --git a/tests/xfs/159 b/tests/xfs/159
index fc5193ff..29bd7243 100755
--- a/tests/xfs/159
+++ b/tests/xfs/159
@@ -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
diff --git a/tests/xfs/160 b/tests/xfs/160
index 9a2e2d04..8b8e2ec4 100755
--- a/tests/xfs/160
+++ b/tests/xfs/160
@@ -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
diff --git a/tests/xfs/161 b/tests/xfs/161
index 11e53def..4124c7f9 100755
--- a/tests/xfs/161
+++ b/tests/xfs/161
@@ -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
diff --git a/tests/xfs/162 b/tests/xfs/162
index 4edb68fd..4e6fc6f7 100755
--- a/tests/xfs/162
+++ b/tests/xfs/162
@@ -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
diff --git a/tests/xfs/163 b/tests/xfs/163
index e283545c..32fff300 100755
--- a/tests/xfs/163
+++ b/tests/xfs/163
@@ -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
diff --git a/tests/xfs/164 b/tests/xfs/164
index 64133240..d8efaa63 100755
--- a/tests/xfs/164
+++ b/tests/xfs/164
@@ -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
diff --git a/tests/xfs/165 b/tests/xfs/165
index 4080a88d..c4ae531f 100755
--- a/tests/xfs/165
+++ b/tests/xfs/165
@@ -63,7 +63,7 @@ _filter_bmap()
# Modify as appropriate.
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_test
# io tests
diff --git a/tests/xfs/170 b/tests/xfs/170
index f772bc40..c5ae8e45 100755
--- a/tests/xfs/170
+++ b/tests/xfs/170
@@ -47,7 +47,7 @@ _cleanup()
# real QA test starts here
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_scratch
diff --git a/tests/xfs/172 b/tests/xfs/172
index 43ef5ab1..17463d79 100755
--- a/tests/xfs/172
+++ b/tests/xfs/172
@@ -46,7 +46,7 @@ _cleanup()
# real QA test starts here
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_scratch
diff --git a/tests/xfs/173 b/tests/xfs/173
index 8c4f9a6f..3a20a9e4 100755
--- a/tests/xfs/173
+++ b/tests/xfs/173
@@ -46,7 +46,7 @@ _cleanup()
# real QA test starts here
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_scratch
diff --git a/tests/xfs/174 b/tests/xfs/174
index 5e2e61b0..daa65a96 100755
--- a/tests/xfs/174
+++ b/tests/xfs/174
@@ -46,7 +46,7 @@ _cleanup()
# real QA test starts here
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_scratch
diff --git a/tests/xfs/181 b/tests/xfs/181
index a2010455..07d75171 100755
--- a/tests/xfs/181
+++ b/tests/xfs/181
@@ -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
diff --git a/tests/xfs/185 b/tests/xfs/185
index 17334de5..d7dfef7a 100755
--- a/tests/xfs/185
+++ b/tests/xfs/185
@@ -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
diff --git a/tests/xfs/188 b/tests/xfs/188
index 8798ecf9..370b93ca 100755
--- a/tests/xfs/188
+++ b/tests/xfs/188
@@ -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
diff --git a/tests/xfs/194 b/tests/xfs/194
index e9e85889..3226431f 100755
--- a/tests/xfs/194
+++ b/tests/xfs/194
@@ -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
diff --git a/tests/xfs/206 b/tests/xfs/206
index d549a4cc..70997e3f 100755
--- a/tests/xfs/206
+++ b/tests/xfs/206
@@ -52,7 +52,7 @@ _cleanup()
# Modify as appropriate.
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_test
_require_loop
diff --git a/tests/xfs/291 b/tests/xfs/291
index c1cbe32c..3f5295c5 100755
--- a/tests/xfs/291
+++ b/tests/xfs/291
@@ -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
diff --git a/tests/xfs/292 b/tests/xfs/292
index db890b5d..98404085 100755
--- a/tests/xfs/292
+++ b/tests/xfs/292
@@ -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
diff --git a/tests/xfs/293 b/tests/xfs/293
index 6ac08c6f..60245a99 100755
--- a/tests/xfs/293
+++ b/tests/xfs/293
@@ -44,7 +44,7 @@ _cleanup()
# Modify as appropriate.
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_command "$MAN_PROG" man
diff --git a/tests/xfs/295 b/tests/xfs/295
index 2325537c..c783df72 100755
--- a/tests/xfs/295
+++ b/tests/xfs/295
@@ -45,7 +45,7 @@ _cleanup()
# Modify as appropriate.
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_scratch
_require_attrs
diff --git a/tests/xfs/297 b/tests/xfs/297
index 9accffd4..708a7f86 100755
--- a/tests/xfs/297
+++ b/tests/xfs/297
@@ -44,7 +44,7 @@ _cleanup()
# real QA test starts here
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
_require_scratch
_require_freeze
diff --git a/tests/xfs/303 b/tests/xfs/303
index de7b27ea..532abd7f 100755
--- a/tests/xfs/303
+++ b/tests/xfs/303
@@ -43,7 +43,7 @@ _cleanup()
# real QA test starts here
_supported_fs xfs
-_supported_os IRIX Linux
+_supported_os Linux
echo "Silence is golden"
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 12/15] tests: clean up per-OS output files
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (10 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 11/15] tests: remove IRIX support from tests also supported on Linux Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 13/15] common: remove IRIX-specific code Eric Biggers
` (3 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
Some tests had separate output files for IRIX and Linux. Now that the
IRIX ones have been removed, rename the Linux ones and remove the
now-unneeded .cfg files and calls to _link_out_file.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
.gitignore | 13 -------------
tests/generic/088 | 3 ---
tests/generic/088.cfg | 1 -
tests/generic/{088.out.linux => 088.out} | 0
tests/xfs/018 | 3 ---
tests/xfs/018.cfg | 1 -
tests/xfs/{018.op.linux => 018.op} | 0
tests/xfs/022 | 3 ---
tests/xfs/022.cfg | 1 -
tests/xfs/{022.out.linux => 022.out} | 0
tests/xfs/023 | 3 ---
tests/xfs/023.cfg | 1 -
tests/xfs/{023.out.linux => 023.out} | 0
tests/xfs/030 | 3 ---
tests/xfs/030.cfg | 1 -
tests/xfs/{030.out.linux => 030.out} | 0
tests/xfs/031 | 3 ---
tests/xfs/031.cfg | 1 -
tests/xfs/{031.out.linux => 031.out} | 0
tests/xfs/033 | 4 ++--
tests/xfs/033.cfg | 3 +--
tests/xfs/{033.out.crc.linux => 033.out.crc} | 0
tests/xfs/{033.out.linux => 033.out.default} | 0
tests/xfs/035 | 3 ---
tests/xfs/035.cfg | 1 -
tests/xfs/{035.out.linux => 035.out} | 0
tests/xfs/036 | 3 ---
tests/xfs/036.cfg | 1 -
tests/xfs/{036.out.linux => 036.out} | 0
tests/xfs/039 | 3 ---
tests/xfs/039.cfg | 1 -
tests/xfs/{039.out.linux => 039.out} | 0
tests/xfs/043 | 3 ---
tests/xfs/043.cfg | 1 -
tests/xfs/{043.out.linux => 043.out} | 0
tests/xfs/055 | 3 ---
tests/xfs/{055.out.linux => 055.out} | 0
tests/xfs/082 | 3 ---
tests/xfs/082.cfg | 1 -
tests/xfs/{082.op.linux => 082.op} | 0
tests/xfs/146 | 3 ---
tests/xfs/146.cfg | 1 -
tests/xfs/{146.out.linux => 146.out} | 0
43 files changed, 3 insertions(+), 68 deletions(-)
delete mode 100644 tests/generic/088.cfg
rename tests/generic/{088.out.linux => 088.out} (100%)
delete mode 100644 tests/xfs/018.cfg
rename tests/xfs/{018.op.linux => 018.op} (100%)
delete mode 100644 tests/xfs/022.cfg
rename tests/xfs/{022.out.linux => 022.out} (100%)
delete mode 100644 tests/xfs/023.cfg
rename tests/xfs/{023.out.linux => 023.out} (100%)
delete mode 100644 tests/xfs/030.cfg
rename tests/xfs/{030.out.linux => 030.out} (100%)
delete mode 100644 tests/xfs/031.cfg
rename tests/xfs/{031.out.linux => 031.out} (100%)
rename tests/xfs/{033.out.crc.linux => 033.out.crc} (100%)
rename tests/xfs/{033.out.linux => 033.out.default} (100%)
delete mode 100644 tests/xfs/035.cfg
rename tests/xfs/{035.out.linux => 035.out} (100%)
delete mode 100644 tests/xfs/036.cfg
rename tests/xfs/{036.out.linux => 036.out} (100%)
delete mode 100644 tests/xfs/039.cfg
rename tests/xfs/{039.out.linux => 039.out} (100%)
delete mode 100644 tests/xfs/043.cfg
rename tests/xfs/{043.out.linux => 043.out} (100%)
rename tests/xfs/{055.out.linux => 055.out} (100%)
delete mode 100644 tests/xfs/082.cfg
rename tests/xfs/{082.op.linux => 082.op} (100%)
delete mode 100644 tests/xfs/146.cfg
rename tests/xfs/{146.out.linux => 146.out} (100%)
diff --git a/.gitignore b/.gitignore
index c0736486..fcbc0cd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/tests/generic/088 b/tests/generic/088
index 1f01c4f5..8d31741b 100755
--- a/tests/generic/088
+++ b/tests/generic/088
@@ -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
diff --git a/tests/generic/088.cfg b/tests/generic/088.cfg
deleted file mode 100644
index 7fd51a7d..00000000
diff --git a/tests/generic/088.out.linux b/tests/generic/088.out
similarity index 100%
rename from tests/generic/088.out.linux
rename to tests/generic/088.out
diff --git a/tests/xfs/018 b/tests/xfs/018
index 253af940..b2913821 100755
--- a/tests/xfs/018
+++ b/tests/xfs/018
@@ -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
diff --git a/tests/xfs/018.cfg b/tests/xfs/018.cfg
deleted file mode 100644
index 7fd51a7d..00000000
diff --git a/tests/xfs/018.op.linux b/tests/xfs/018.op
similarity index 100%
rename from tests/xfs/018.op.linux
rename to tests/xfs/018.op
diff --git a/tests/xfs/022 b/tests/xfs/022
index 1cd6d28e..ebe539ab 100755
--- a/tests/xfs/022
+++ b/tests/xfs/022
@@ -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
diff --git a/tests/xfs/022.cfg b/tests/xfs/022.cfg
deleted file mode 100644
index 7fd51a7d..00000000
diff --git a/tests/xfs/022.out.linux b/tests/xfs/022.out
similarity index 100%
rename from tests/xfs/022.out.linux
rename to tests/xfs/022.out
diff --git a/tests/xfs/023 b/tests/xfs/023
index d304384b..fff49d56 100755
--- a/tests/xfs/023
+++ b/tests/xfs/023
@@ -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
diff --git a/tests/xfs/023.cfg b/tests/xfs/023.cfg
deleted file mode 100644
index 7fd51a7d..00000000
diff --git a/tests/xfs/023.out.linux b/tests/xfs/023.out
similarity index 100%
rename from tests/xfs/023.out.linux
rename to tests/xfs/023.out
diff --git a/tests/xfs/030 b/tests/xfs/030
index 4d8d7d67..bc807753 100755
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -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()
diff --git a/tests/xfs/030.cfg b/tests/xfs/030.cfg
deleted file mode 100644
index 7fd51a7d..00000000
diff --git a/tests/xfs/030.out.linux b/tests/xfs/030.out
similarity index 100%
rename from tests/xfs/030.out.linux
rename to tests/xfs/030.out
diff --git a/tests/xfs/031 b/tests/xfs/031
index 678c3249..b05f28b0 100755
--- a/tests/xfs/031
+++ b/tests/xfs/031
@@ -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
diff --git a/tests/xfs/031.cfg b/tests/xfs/031.cfg
deleted file mode 100644
index 7fd51a7d..00000000
diff --git a/tests/xfs/031.out.linux b/tests/xfs/031.out
similarity index 100%
rename from tests/xfs/031.out.linux
rename to tests/xfs/031.out
diff --git a/tests/xfs/033 b/tests/xfs/033
index a6f93f29..321856fc 100755
--- a/tests/xfs/033
+++ b/tests/xfs/033
@@ -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"
diff --git a/tests/xfs/033.cfg b/tests/xfs/033.cfg
index 768ca9e0..46df3b03 100644
--- a/tests/xfs/033.cfg
+++ b/tests/xfs/033.cfg
@@ -1,2 +1 @@
-linux,crc: crc.linux
-linux: linux
+crc: crc
diff --git a/tests/xfs/033.out.crc.linux b/tests/xfs/033.out.crc
similarity index 100%
rename from tests/xfs/033.out.crc.linux
rename to tests/xfs/033.out.crc
diff --git a/tests/xfs/033.out.linux b/tests/xfs/033.out.default
similarity index 100%
rename from tests/xfs/033.out.linux
rename to tests/xfs/033.out.default
diff --git a/tests/xfs/035 b/tests/xfs/035
index 6b6c86b7..1fde45df 100755
--- a/tests/xfs/035
+++ b/tests/xfs/035
@@ -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
diff --git a/tests/xfs/035.cfg b/tests/xfs/035.cfg
deleted file mode 100644
index 7fd51a7d..00000000
diff --git a/tests/xfs/035.out.linux b/tests/xfs/035.out
similarity index 100%
rename from tests/xfs/035.out.linux
rename to tests/xfs/035.out
diff --git a/tests/xfs/036 b/tests/xfs/036
index c65523f5..2a930b20 100755
--- a/tests/xfs/036
+++ b/tests/xfs/036
@@ -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
diff --git a/tests/xfs/036.cfg b/tests/xfs/036.cfg
deleted file mode 100644
index 7fd51a7d..00000000
diff --git a/tests/xfs/036.out.linux b/tests/xfs/036.out
similarity index 100%
rename from tests/xfs/036.out.linux
rename to tests/xfs/036.out
diff --git a/tests/xfs/039 b/tests/xfs/039
index 62735906..51d5544a 100755
--- a/tests/xfs/039
+++ b/tests/xfs/039
@@ -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
diff --git a/tests/xfs/039.cfg b/tests/xfs/039.cfg
deleted file mode 100644
index 7fd51a7d..00000000
diff --git a/tests/xfs/039.out.linux b/tests/xfs/039.out
similarity index 100%
rename from tests/xfs/039.out.linux
rename to tests/xfs/039.out
diff --git a/tests/xfs/043 b/tests/xfs/043
index caca73da..9bd6f1ec 100755
--- a/tests/xfs/043
+++ b/tests/xfs/043
@@ -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
diff --git a/tests/xfs/043.cfg b/tests/xfs/043.cfg
deleted file mode 100644
index 7fd51a7d..00000000
diff --git a/tests/xfs/043.out.linux b/tests/xfs/043.out
similarity index 100%
rename from tests/xfs/043.out.linux
rename to tests/xfs/043.out
diff --git a/tests/xfs/055 b/tests/xfs/055
index 383058a5..9f67e176 100755
--- a/tests/xfs/055
+++ b/tests/xfs/055
@@ -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
diff --git a/tests/xfs/055.out.linux b/tests/xfs/055.out
similarity index 100%
rename from tests/xfs/055.out.linux
rename to tests/xfs/055.out
diff --git a/tests/xfs/082 b/tests/xfs/082
index f824d5ef..03878379 100755
--- a/tests/xfs/082
+++ b/tests/xfs/082
@@ -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
diff --git a/tests/xfs/082.cfg b/tests/xfs/082.cfg
deleted file mode 100644
index 7fd51a7d..00000000
diff --git a/tests/xfs/082.op.linux b/tests/xfs/082.op
similarity index 100%
rename from tests/xfs/082.op.linux
rename to tests/xfs/082.op
diff --git a/tests/xfs/146 b/tests/xfs/146
index ea448db2..9d93e951 100755
--- a/tests/xfs/146
+++ b/tests/xfs/146
@@ -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
diff --git a/tests/xfs/146.cfg b/tests/xfs/146.cfg
deleted file mode 100644
index 7fd51a7d..00000000
diff --git a/tests/xfs/146.out.linux b/tests/xfs/146.out
similarity index 100%
rename from tests/xfs/146.out.linux
rename to tests/xfs/146.out
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 13/15] common: remove IRIX-specific code
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (11 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 12/15] tests: clean up per-OS output files Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-28 11:19 ` Eryu Guan
2017-07-21 4:38 ` [PATCH v2 14/15] build: remove IRIX-specific build logic Eric Biggers
` (2 subsequent siblings)
15 siblings, 1 reply; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
As xfstests is no longer supported on IRIX, remove IRIX-specific code
from the common helper scripts.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
common/config | 12 ------------
common/dump | 39 +++------------------------------------
common/filestreams | 43 ++++++-------------------------------------
common/log | 1 -
common/rc | 23 +++--------------------
5 files changed, 12 insertions(+), 106 deletions(-)
diff --git a/common/config b/common/config
index 5091db9d..80598d06 100644
--- a/common/config
+++ b/common/config
@@ -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`"
diff --git a/common/dump b/common/dump
index d6663e0c..b0e4a12f 100644
--- a/common/dump
+++ b/common/dump
@@ -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"
}
#
diff --git a/common/filestreams b/common/filestreams
index 4d146648..f5441f5a 100644
--- a/common/filestreams
+++ b/common/filestreams
@@ -21,35 +21,12 @@
_check_filestreams_support()
{
- local irix_timeout_sysvar="xfs_mfstream_timeout"
- local linux_timeout_procvar="/proc/sys/fs/xfs/filestream_centisecs"
- local streams_avail=""
- if [ "$HOSTOS" == "IRIX" ]; then
- # check for the filestreams timeout systune variable in irix
- streams_avail=`systune $irix_timeout_sysvar 2>&1 |
- perl -ne 'if (/'$irix_timeout_sysvar'\s+=\s+\d+/) {print "true"}'`
- else
- # check for the filestreams timeout proc entry in linux
- [ -f $linux_timeout_procvar ] && streams_avail="true"
- fi
-
- if [ "$streams_avail" == "true" ]; then
- return 0
- else
- return 1
- fi
+ [ -f /proc/sys/fs/xfs/filestream_centisecs ]
}
_set_stream_timeout_centisecs()
{
- local new_timeout_csecs=$1
- local irix_timeout_sysvar="xfs_mfstream_timeout"
- local linux_timeout_procvar="/proc/sys/fs/xfs/filestream_centisecs"
- if [ "$HOSTOS" == "IRIX" ]; then
- echo y | systune -r $irix_timeout_sysvar $new_timeout_csecs >/dev/null
- else
- echo $new_timeout_csecs > $linux_timeout_procvar
- fi
+ echo $1 > /proc/sys/fs/xfs/filestream_centisecs
}
_do_stream()
@@ -63,22 +40,14 @@ _do_stream()
local blocks_in_file=`expr $file_size / $bsize`
mkdir $directory_name
- if [ "$iflag" = "1" -a "$HOSTOS" != "IRIX" ]; then
+ if [ "$iflag" = "1" ]; then
$XFS_IO_PROG -x -c "chattr +S" $directory_name \
|| _fail "chattr of filestream flag"
fi
cd $directory_name
- local dd_cmd=""
- if [ "$HOSTOS" == "IRIX" ]; then
- # for irix use lmdd
- dd_cmd="lmdd"
- [ "$dio" = "1" ] && dd_cmd="$dd_cmd odirect=1"
- else
- # for linux use dd
- dd_cmd="dd"
- [ "$dio" = "1" ] && dd_cmd="$dd_cmd oflag=direct"
- fi
+ local dd_cmd="dd"
+ [ "$dio" = "1" ] && dd_cmd="$dd_cmd oflag=direct"
dd_cmd="$dd_cmd if=/dev/zero bs=${bsize} count=${blocks_in_file}"
local i=1
@@ -140,7 +109,7 @@ _test_streams() {
_scratch_mkfs_xfs -dsize=$size,agcount=$agcount >/dev/null 2>&1 \
|| _fail "mkfs failed"
- if [ "$use_iflag" = "0" -o "$HOSTOS" == "IRIX" ]; then
+ if [ "$use_iflag" = "0" ]; then
# mount using filestreams mount option
_scratch_mount "-o filestreams" \
|| _fail "filestreams mount failed"
diff --git a/common/log b/common/log
index d1c19ff5..bdb4ed68 100644
--- a/common/log
+++ b/common/log
@@ -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()
{
diff --git a/common/rc b/common/rc
index fa1314c6..d3bf8339 100644
--- a/common/rc
+++ b/common/rc
@@ -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
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v2 13/15] common: remove IRIX-specific code
2017-07-21 4:38 ` [PATCH v2 13/15] common: remove IRIX-specific code Eric Biggers
@ 2017-07-28 11:19 ` Eryu Guan
2017-07-28 16:50 ` Eric Biggers
0 siblings, 1 reply; 20+ messages in thread
From: Eryu Guan @ 2017-07-28 11:19 UTC (permalink / raw)
To: Eric Biggers; +Cc: fstests, linux-xfs, Eric Biggers
On Thu, Jul 20, 2017 at 09:38:51PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> As xfstests is no longer supported on IRIX, remove IRIX-specific code
> from the common helper scripts.
>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
> common/config | 12 ------------
> common/dump | 39 +++------------------------------------
> common/filestreams | 43 ++++++-------------------------------------
> common/log | 1 -
> common/rc | 23 +++--------------------
> 5 files changed, 12 insertions(+), 106 deletions(-)
>
> diff --git a/common/config b/common/config
> index 5091db9d..80598d06 100644
> --- a/common/config
> +++ b/common/config
> @@ -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`"
> diff --git a/common/dump b/common/dump
> index d6663e0c..b0e4a12f 100644
> --- a/common/dump
> +++ b/common/dump
> @@ -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 |\
I added this _filter_devchar function back as xfs/061 needs it,
otherwise it fails like:
-xfsrestore: volume: /dev/dsk/dks0d2s1
+xfsrestore: volume: /hw/node/io/gio/hpc/scsi_ctlr/0/target/2/lun/0/disk/partition/1/char
I think this is the safest and easiest thing to do at this moment.
Thanks,
Eryu
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v2 13/15] common: remove IRIX-specific code
2017-07-28 11:19 ` Eryu Guan
@ 2017-07-28 16:50 ` Eric Biggers
0 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-28 16:50 UTC (permalink / raw)
To: Eryu Guan; +Cc: fstests, linux-xfs, Eric Biggers
On Fri, Jul 28, 2017 at 07:19:26PM +0800, Eryu Guan wrote:
> > -#
> > -# 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 |\
>
> I added this _filter_devchar function back as xfs/061 needs it,
> otherwise it fails like:
>
> -xfsrestore: volume: /dev/dsk/dks0d2s1
> +xfsrestore: volume: /hw/node/io/gio/hpc/scsi_ctlr/0/target/2/lun/0/disk/partition/1/char
>
> I think this is the safest and easiest thing to do at this moment.
>
Okay, that's fine for now. Thanks for testing!
Eric
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 14/15] build: remove IRIX-specific build logic
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (12 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 13/15] common: remove IRIX-specific code Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-21 4:38 ` [PATCH v2 15/15] include: remove some unused headers Eric Biggers
2017-07-24 4:43 ` [PATCH v2 00/15] xfstests: remove IRIX support Eryu Guan
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
As xfstests is no longer supported on IRIX, remove the ability to build
xfstests for IRIX.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
configure.ac | 59 ++++++++++----------------
include/builddefs.in | 3 --
ltp/Makefile | 4 --
m4/package_globals.m4 | 2 +-
m4/package_libcdev.m4 | 2 +-
m4/package_utilies.m4 | 14 +++----
m4/package_xfslibs.m4 | 13 ------
make_irix | 114 --------------------------------------------------
src/Makefile | 4 --
9 files changed, 32 insertions(+), 183 deletions(-)
delete mode 100755 make_irix
diff --git a/configure.ac b/configure.ac
index 843ff6b6..57092f1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
diff --git a/include/builddefs.in b/include/builddefs.in
index 38fb9c60..cb52b99a 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -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
diff --git a/ltp/Makefile b/ltp/Makefile
index 5bea4927..eed83f48 100644
--- a/ltp/Makefile
+++ b/ltp/Makefile
@@ -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
diff --git a/m4/package_globals.m4 b/m4/package_globals.m4
index 72fbbb78..ce7a8c51 100644
--- a/m4/package_globals.m4
+++ b/m4/package_globals.m4
@@ -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)
])
diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4
index 5156ced6..fb123f33 100644
--- a/m4/package_libcdev.m4
+++ b/m4/package_libcdev.m4
@@ -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 ])
diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4
index 726406c8..108ef455 100644
--- a/m4/package_utilies.m4
+++ b/m4/package_utilies.m4
@@ -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)
diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4
index 5588e9ed..9be56e11 100644
--- a/m4/package_xfslibs.m4
+++ b/m4/package_xfslibs.m4
@@ -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([
diff --git a/make_irix b/make_irix
deleted file mode 100755
index d1782785..00000000
diff --git a/src/Makefile b/src/Makefile
index cb608ad4..b8aff49e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -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)
--
2.13.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 15/15] include: remove some unused headers
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (13 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 14/15] build: remove IRIX-specific build logic Eric Biggers
@ 2017-07-21 4:38 ` Eric Biggers
2017-07-24 4:43 ` [PATCH v2 00/15] xfstests: remove IRIX support Eryu Guan
15 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-21 4:38 UTC (permalink / raw)
To: fstests; +Cc: linux-xfs, Eric Biggers
From: Eric Biggers <ebiggers@google.com>
test.h and usctest.h aren't used by anything. Get rid of them.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
include/test.h | 192 ----------------------------------
include/usctest.h | 303 ------------------------------------------------------
2 files changed, 495 deletions(-)
delete mode 100644 include/test.h
delete mode 100644 include/usctest.h
diff --git a/include/test.h b/include/test.h
deleted file mode 100644
index 29580dde..00000000
diff --git a/include/usctest.h b/include/usctest.h
deleted file mode 100644
index 193852ff..00000000
--
2.13.3
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v2 00/15] xfstests: remove IRIX support
2017-07-21 4:38 [PATCH v2 00/15] xfstests: remove IRIX support Eric Biggers
` (14 preceding siblings ...)
2017-07-21 4:38 ` [PATCH v2 15/15] include: remove some unused headers Eric Biggers
@ 2017-07-24 4:43 ` Eryu Guan
2017-07-24 17:38 ` Eric Biggers
15 siblings, 1 reply; 20+ messages in thread
From: Eryu Guan @ 2017-07-24 4:43 UTC (permalink / raw)
To: Eric Biggers; +Cc: fstests, linux-xfs
On Thu, Jul 20, 2017 at 09:38:38PM -0700, Eric Biggers wrote:
> Hello,
>
> This is v2 of the patchset to remove IRIX support from xfstests. For
> some time xfstests has de facto not supported IRIX anymore. The final
> release of IRIX was over 10 years ago and it seems no one has been
> running the latest xfstests releases on any IRIX system, as at the very
> least xfstests now assumes the existence of some util-linux binaries.
> There are very likely other examples of this bitrot as well. Also,
> xfsprogs has already dropped IRIX support.
>
> Therefore, this patchset simplifies things by removing IRIX support from
> the xfstests tests, build system, and documentation. It also ports the
> useful IRIX-specific tests to Linux. Of course, people will still find
> more cruft later to remove, but this should be a good start.
>
> To get around the mailing list message size limit, the series is
> formatted with --irreversible-delete. Therefore it can't be applied
> directly. It can be retrieved from git here:
> https://github.com/ebiggers/xfstests.git, branch remove_irix_support_v2.
Great work! Thank you so much for doing this! I pulled & merged your
branch into a test branch and am running some tests now, overall it
looks good to me.
Though, as you mentioned, there're some places that could do further
cleanups (e.g. I'm wondering if we can kill _supported_os completely and
remove it from 'new' template, and some $HOSTOS and $PKG_PLATFORM checks
could be cleaned up too), I agree this is a great start. Thanks again!
Eryu
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v2 00/15] xfstests: remove IRIX support
2017-07-24 4:43 ` [PATCH v2 00/15] xfstests: remove IRIX support Eryu Guan
@ 2017-07-24 17:38 ` Eric Biggers
0 siblings, 0 replies; 20+ messages in thread
From: Eric Biggers @ 2017-07-24 17:38 UTC (permalink / raw)
To: Eryu Guan; +Cc: fstests, linux-xfs
On Mon, Jul 24, 2017 at 12:43:08PM +0800, Eryu Guan wrote:
> On Thu, Jul 20, 2017 at 09:38:38PM -0700, Eric Biggers wrote:
> > Hello,
> >
> > This is v2 of the patchset to remove IRIX support from xfstests. For
> > some time xfstests has de facto not supported IRIX anymore. The final
> > release of IRIX was over 10 years ago and it seems no one has been
> > running the latest xfstests releases on any IRIX system, as at the very
> > least xfstests now assumes the existence of some util-linux binaries.
> > There are very likely other examples of this bitrot as well. Also,
> > xfsprogs has already dropped IRIX support.
> >
> > Therefore, this patchset simplifies things by removing IRIX support from
> > the xfstests tests, build system, and documentation. It also ports the
> > useful IRIX-specific tests to Linux. Of course, people will still find
> > more cruft later to remove, but this should be a good start.
> >
> > To get around the mailing list message size limit, the series is
> > formatted with --irreversible-delete. Therefore it can't be applied
> > directly. It can be retrieved from git here:
> > https://github.com/ebiggers/xfstests.git, branch remove_irix_support_v2.
>
> Great work! Thank you so much for doing this! I pulled & merged your
> branch into a test branch and am running some tests now, overall it
> looks good to me.
>
> Though, as you mentioned, there're some places that could do further
> cleanups (e.g. I'm wondering if we can kill _supported_os completely and
> remove it from 'new' template, and some $HOSTOS and $PKG_PLATFORM checks
> could be cleaned up too), I agree this is a great start. Thanks again!
>
We shouldn't make it too hard to port xfstests to other platforms in the future,
but yes I think at least _supported_os and $HOSTOS should probably go, since
they're subject to bitrot and checking the OS isn't usually what is really
wanted anyway. Really we should check for the presence of some feature,
program, quirk, etc. instead, instead of being lazy and checking for "Linux".
Eric
^ permalink raw reply [flat|nested] 20+ messages in thread