* [PATCH 1/6] README: remove IRIX-specific documentation
2017-05-31 22:36 [PATCH 0/6] xfstests: remove most IRIX-specific code Eric Biggers
@ 2017-05-31 22:36 ` Eric Biggers
2017-05-31 22:36 ` [PATCH 4/6] tests: clean up per-OS output files Eric Biggers
` (3 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Eric Biggers @ 2017-05-31 22:36 UTC (permalink / raw)
To: fstests; +Cc: 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 fd491e4a..5cdc63fb 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.0.506.g27d5fe0cd-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/6] tests: clean up per-OS output files
2017-05-31 22:36 [PATCH 0/6] xfstests: remove most IRIX-specific code Eric Biggers
2017-05-31 22:36 ` [PATCH 1/6] README: remove IRIX-specific documentation Eric Biggers
@ 2017-05-31 22:36 ` Eric Biggers
2017-05-31 22:36 ` [PATCH 5/6] common: remove IRIX-specific code Eric Biggers
` (2 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Eric Biggers @ 2017-05-31 22:36 UTC (permalink / raw)
To: fstests; +Cc: 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 388f5af3..feeaed45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -231,19 +231,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
--- a/tests/generic/088.cfg
+++ /dev/null
@@ -1 +0,0 @@
-linux: linux
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
--- a/tests/xfs/018.cfg
+++ /dev/null
@@ -1 +0,0 @@
-linux: linux
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
--- a/tests/xfs/022.cfg
+++ /dev/null
@@ -1 +0,0 @@
-linux: linux
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
--- a/tests/xfs/023.cfg
+++ /dev/null
@@ -1 +0,0 @@
-linux: linux
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
--- a/tests/xfs/030.cfg
+++ /dev/null
@@ -1 +0,0 @@
-linux: linux
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
--- a/tests/xfs/031.cfg
+++ /dev/null
@@ -1 +0,0 @@
-linux: linux
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
--- a/tests/xfs/035.cfg
+++ /dev/null
@@ -1 +0,0 @@
-linux: linux
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
--- a/tests/xfs/036.cfg
+++ /dev/null
@@ -1 +0,0 @@
-linux: linux
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
--- a/tests/xfs/039.cfg
+++ /dev/null
@@ -1 +0,0 @@
-linux: linux
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
--- a/tests/xfs/043.cfg
+++ /dev/null
@@ -1 +0,0 @@
-linux: linux
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
--- a/tests/xfs/082.cfg
+++ /dev/null
@@ -1 +0,0 @@
-linux: linux
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
--- a/tests/xfs/146.cfg
+++ /dev/null
@@ -1 +0,0 @@
-linux: linux
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.0.506.g27d5fe0cd-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 5/6] common: remove IRIX-specific code
2017-05-31 22:36 [PATCH 0/6] xfstests: remove most IRIX-specific code Eric Biggers
2017-05-31 22:36 ` [PATCH 1/6] README: remove IRIX-specific documentation Eric Biggers
2017-05-31 22:36 ` [PATCH 4/6] tests: clean up per-OS output files Eric Biggers
@ 2017-05-31 22:36 ` Eric Biggers
2017-05-31 22:36 ` [PATCH 6/6] build: remove IRIX-specific build logic Eric Biggers
2017-06-01 3:12 ` [PATCH 0/6] xfstests: remove most IRIX-specific code Eryu Guan
4 siblings, 0 replies; 12+ messages in thread
From: Eric Biggers @ 2017-05-31 22:36 UTC (permalink / raw)
To: fstests; +Cc: 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/attr | 6 +-----
common/config | 12 ------------
common/dump | 39 +++------------------------------------
common/filestreams | 43 ++++++-------------------------------------
common/log | 1 -
common/rc | 23 +++--------------------
6 files changed, 13 insertions(+), 111 deletions(-)
diff --git a/common/attr b/common/attr
index c840ce42..42a197fe 100644
--- a/common/attr
+++ b/common/attr
@@ -122,11 +122,7 @@ _acl_list()
{
_file1=$1
- if [ $HOSTOS = "IRIX" ]; then
- ls -dD $_file1 | _acl_filter_id
- else
- chacl -l $_file1 | _acl_filter_id
- fi
+ chacl -l $_file1 | _acl_filter_id
}
# create an ACL with n ACEs in it
diff --git a/common/config b/common/config
index 090e9117..09237519 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
@@ -219,13 +214,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 743df427..346b23af 100644
--- a/common/rc
+++ b/common/rc
@@ -235,7 +235,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"
;;
@@ -284,14 +284,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;"
}
@@ -2042,12 +2035,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()
@@ -2606,9 +2594,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`
@@ -3172,9 +3158,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.0.506.g27d5fe0cd-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 6/6] build: remove IRIX-specific build logic
2017-05-31 22:36 [PATCH 0/6] xfstests: remove most IRIX-specific code Eric Biggers
` (2 preceding siblings ...)
2017-05-31 22:36 ` [PATCH 5/6] common: remove IRIX-specific code Eric Biggers
@ 2017-05-31 22:36 ` Eric Biggers
2017-06-01 3:12 ` [PATCH 0/6] xfstests: remove most IRIX-specific code Eryu Guan
4 siblings, 0 replies; 12+ messages in thread
From: Eric Biggers @ 2017-05-31 22:36 UTC (permalink / raw)
To: fstests; +Cc: 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
--- a/make_irix
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2004 Silicon Graphics, 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
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-#
-# Do a build using the IRIX TOOLROOT
-# Use "-f" to force a configure.
-#
-
-error=false
-
-# Do initial checks
-
-# check have root/toolroot set
-if [ -z "$TOOLROOT" ]; then
- echo "TOOLROOT needs to be set to a populated IRIX toolroot"
- error=true
-fi
-if [ -z "$ROOT" ]; then
- echo "ROOT needs to be set to a populated IRIX root"
- error=true
-fi
-
-# check we have c compiler license
-if ! grep -iq '^feature cc' /var/flexlm/license.dat; then
- echo "Unable to find cc license for IRIX"
- echo "Get license: http://www.csd.sgi.com/prod/software/swl/keyrequest.html"
- error=true
-fi
-
-# check we have dev.sw.lib installed
-# needed by ld32 even though we have $ROOT
-if versions dev.sw.lib | grep -q dev.sw.lib; then
- :
-else
- echo "dev.sw.lib is not installed"
- echo "Install from irix-6.5-development-libraries-1/dist"
- error=true
-fi
-
-# any check failures then exit out
-$error && exit 1
-
-# root/toolroot paths
-fw_bin=$TOOLROOT/usr/freeware/bin
-fw_tools=$TOOLROOT/usr/fw_tools
-fw_share=$ROOT/usr/freeware/share
-irix_bin=$TOOLROOT/usr/bin
-
-# env vars
-export AC_MACRODIR=$fw_share/autoconf
-export M4=$irix_bin/gnum4
-export CC=$irix_bin/cc
-export LIBTOOL=$fw_bin/libtool
-export MAKE=$fw_tools/gmake
-export AWK=$irix_bin/nawk
-
-# check all tools/files are in root/toolroot that we need
-FILES="$AC_MACRODIR $M4 $CC $LIBTOOL $MAKE $fw_bin/aclocal $fw_bin/autoheader $fw_bin/autoconf"
-for f in $FILES; do
- if [ ! -e $f ]; then
- echo "file $f not found in ROOT/TOOLROOT"
- error=true
- fi
-done
-$error && exit 1
-
-# force a full configure
-if [ $# -eq 1 ]; then
- if [ $1 = "-f" ]; then
- rm -f config.cache configure include/builddefs
- shift
- fi
-fi
-
-# --- do all the configure stuff using the toolroot paths ---
-
-# aclocal.m4 is actually checked in - probably won't recreate it often
-if [ ! -e aclocal.m4 ]; then
- set -x
- $fw_bin/aclocal --acdir=m4 --output=aclocal.m4
- set -
-fi
-
-if [ ! -e ./configure ]; then
- set -x
- $fw_bin/autoheader
- $fw_bin/autoconf
- set -
-fi
-
-if [ ! -e include/builddefs ]; then
- set -x
- ./configure
- set -
-fi
-
-# Now call gmake with any args we were given
-set -x
-$MAKE $@
-set -
diff --git a/src/Makefile b/src/Makefile
index 4ec01975..5c87c29c 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.0.506.g27d5fe0cd-goog
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 0/6] xfstests: remove most IRIX-specific code
2017-05-31 22:36 [PATCH 0/6] xfstests: remove most IRIX-specific code Eric Biggers
` (3 preceding siblings ...)
2017-05-31 22:36 ` [PATCH 6/6] build: remove IRIX-specific build logic Eric Biggers
@ 2017-06-01 3:12 ` Eryu Guan
2017-06-01 3:29 ` Eric Biggers
4 siblings, 1 reply; 12+ messages in thread
From: Eryu Guan @ 2017-06-01 3:12 UTC (permalink / raw)
To: Eric Biggers; +Cc: fstests, Eric Biggers
On Wed, May 31, 2017 at 03:36:49PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> 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 probably other examples of this bitrot too.
>
> Therefore, this patchset simplifies things removing IRIX support from
> the xfstests tests, build system, and documentation.
>
> It focuses on making larger, more obvious cleanups. Of course,
> there's more to do if people want to spend more time going through
> some of the more intricate details, especially XFS-specific details.
> But this should be a good start.
Thanks a lot for doing this!! I didn't see patch #2 and #3 hit the list
(too big for the list?). Do you have a public git repo that I can pull
from?
Thanks again!
Eryu
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 0/6] xfstests: remove most IRIX-specific code
2017-06-01 3:12 ` [PATCH 0/6] xfstests: remove most IRIX-specific code Eryu Guan
@ 2017-06-01 3:29 ` Eric Biggers
2017-06-01 7:29 ` Eryu Guan
0 siblings, 1 reply; 12+ messages in thread
From: Eric Biggers @ 2017-06-01 3:29 UTC (permalink / raw)
To: Eryu Guan; +Cc: fstests, Eric Biggers
On Thu, Jun 01, 2017 at 11:12:35AM +0800, Eryu Guan wrote:
> On Wed, May 31, 2017 at 03:36:49PM -0700, Eric Biggers wrote:
> > From: Eric Biggers <ebiggers@google.com>
> >
> > 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 probably other examples of this bitrot too.
> >
> > Therefore, this patchset simplifies things removing IRIX support from
> > the xfstests tests, build system, and documentation.
> >
> > It focuses on making larger, more obvious cleanups. Of course,
> > there's more to do if people want to spend more time going through
> > some of the more intricate details, especially XFS-specific details.
> > But this should be a good start.
>
> Thanks a lot for doing this!! I didn't see patch #2 and #3 hit the list
> (too big for the list?). Do you have a public git repo that I can pull
> from?
>
Ick, I guess the size limit must be 100K. I've pushed the series out to
repository https://github.com/ebiggers/xfstests, branch "remove_irix_support".
Note that the two biggest patches can be more easily reviewed with
'git diff -D', since that abbreviates the file deletions.
Eric
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/6] xfstests: remove most IRIX-specific code
2017-06-01 3:29 ` Eric Biggers
@ 2017-06-01 7:29 ` Eryu Guan
2017-06-01 15:33 ` Darrick J. Wong
0 siblings, 1 reply; 12+ messages in thread
From: Eryu Guan @ 2017-06-01 7:29 UTC (permalink / raw)
To: Eric Biggers; +Cc: fstests, Eric Biggers, linux-xfs
On Wed, May 31, 2017 at 08:29:04PM -0700, Eric Biggers wrote:
> On Thu, Jun 01, 2017 at 11:12:35AM +0800, Eryu Guan wrote:
> > On Wed, May 31, 2017 at 03:36:49PM -0700, Eric Biggers wrote:
> > > From: Eric Biggers <ebiggers@google.com>
> > >
> > > 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 probably other examples of this bitrot too.
> > >
> > > Therefore, this patchset simplifies things removing IRIX support from
> > > the xfstests tests, build system, and documentation.
> > >
> > > It focuses on making larger, more obvious cleanups. Of course,
> > > there's more to do if people want to spend more time going through
> > > some of the more intricate details, especially XFS-specific details.
> > > But this should be a good start.
> >
> > Thanks a lot for doing this!! I didn't see patch #2 and #3 hit the list
> > (too big for the list?). Do you have a public git repo that I can pull
> > from?
> >
>
> Ick, I guess the size limit must be 100K. I've pushed the series out to
> repository https://github.com/ebiggers/xfstests, branch "remove_irix_support".
>
> Note that the two biggest patches can be more easily reviewed with
> 'git diff -D', since that abbreviates the file deletions.
Thanks!
I also cc'ed linux-xfs list for review, as IRIX support is mainly for
XFS.
Eryu
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/6] xfstests: remove most IRIX-specific code
2017-06-01 7:29 ` Eryu Guan
@ 2017-06-01 15:33 ` Darrick J. Wong
2017-06-02 1:25 ` Eric Biggers
2017-06-02 3:34 ` Eryu Guan
0 siblings, 2 replies; 12+ messages in thread
From: Darrick J. Wong @ 2017-06-01 15:33 UTC (permalink / raw)
To: Eryu Guan; +Cc: Eric Biggers, fstests, Eric Biggers, linux-xfs
On Thu, Jun 01, 2017 at 03:29:02PM +0800, Eryu Guan wrote:
> On Wed, May 31, 2017 at 08:29:04PM -0700, Eric Biggers wrote:
> > On Thu, Jun 01, 2017 at 11:12:35AM +0800, Eryu Guan wrote:
> > > On Wed, May 31, 2017 at 03:36:49PM -0700, Eric Biggers wrote:
> > > > From: Eric Biggers <ebiggers@google.com>
> > > >
> > > > 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 probably other examples of this bitrot too.
> > > >
> > > > Therefore, this patchset simplifies things removing IRIX support from
> > > > the xfstests tests, build system, and documentation.
> > > >
> > > > It focuses on making larger, more obvious cleanups. Of course,
> > > > there's more to do if people want to spend more time going through
> > > > some of the more intricate details, especially XFS-specific details.
> > > > But this should be a good start.
> > >
> > > Thanks a lot for doing this!! I didn't see patch #2 and #3 hit the list
> > > (too big for the list?). Do you have a public git repo that I can pull
> > > from?
> > >
> >
> > Ick, I guess the size limit must be 100K. I've pushed the series out to
> > repository https://github.com/ebiggers/xfstests, branch "remove_irix_support".
> >
> > Note that the two biggest patches can be more easily reviewed with
> > 'git diff -D', since that abbreviates the file deletions.
>
> Thanks!
>
> I also cc'ed linux-xfs list for review, as IRIX support is mainly for
> XFS.
I think it's safe to drop IRIX support; xfsprogs dropped it in 4.10.
That said, I also think "tests: remove IRIX-specific tests" removes too
many tests. generic/097 looks like a fairly generic xattr usage test,
why not just fix it to work on Linux (and sort the attrs to stabilize
the output)? Neither of the removed udf tests seem to test anything
Irix specific; either fix them to work with the Linux udf tools (or kill
udf/102).
I looked through the rest of the patches in the branch and they looked
ok to me. Thanks for cleaning out that cruft.
--D
>
> Eryu
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/6] xfstests: remove most IRIX-specific code
2017-06-01 15:33 ` Darrick J. Wong
@ 2017-06-02 1:25 ` Eric Biggers
2017-06-02 2:54 ` Eryu Guan
2017-06-02 3:34 ` Eryu Guan
1 sibling, 1 reply; 12+ messages in thread
From: Eric Biggers @ 2017-06-02 1:25 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: Eryu Guan, fstests, Eric Biggers, linux-xfs
On Thu, Jun 01, 2017 at 08:33:47AM -0700, Darrick J. Wong wrote:
> On Thu, Jun 01, 2017 at 03:29:02PM +0800, Eryu Guan wrote:
> > On Wed, May 31, 2017 at 08:29:04PM -0700, Eric Biggers wrote:
> > > On Thu, Jun 01, 2017 at 11:12:35AM +0800, Eryu Guan wrote:
> > > > On Wed, May 31, 2017 at 03:36:49PM -0700, Eric Biggers wrote:
> > > > > From: Eric Biggers <ebiggers@google.com>
> > > > >
> > > > > 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 probably other examples of this bitrot too.
> > > > >
> > > > > Therefore, this patchset simplifies things removing IRIX support from
> > > > > the xfstests tests, build system, and documentation.
> > > > >
> > > > > It focuses on making larger, more obvious cleanups. Of course,
> > > > > there's more to do if people want to spend more time going through
> > > > > some of the more intricate details, especially XFS-specific details.
> > > > > But this should be a good start.
> > > >
> > > > Thanks a lot for doing this!! I didn't see patch #2 and #3 hit the list
> > > > (too big for the list?). Do you have a public git repo that I can pull
> > > > from?
> > > >
> > >
> > > Ick, I guess the size limit must be 100K. I've pushed the series out to
> > > repository https://github.com/ebiggers/xfstests, branch "remove_irix_support".
> > >
> > > Note that the two biggest patches can be more easily reviewed with
> > > 'git diff -D', since that abbreviates the file deletions.
> >
> > Thanks!
> >
> > I also cc'ed linux-xfs list for review, as IRIX support is mainly for
> > XFS.
>
> I think it's safe to drop IRIX support; xfsprogs dropped it in 4.10.
>
> That said, I also think "tests: remove IRIX-specific tests" removes too
> many tests. generic/097 looks like a fairly generic xattr usage test,
> why not just fix it to work on Linux (and sort the attrs to stabilize
> the output)? Neither of the removed udf tests seem to test anything
> Irix specific; either fix them to work with the Linux udf tools (or kill
> udf/102).
>
> I looked through the rest of the patches in the branch and they looked
> ok to me. Thanks for cleaning out that cruft.
>
> --D
>
Okay, thanks for the review. When I have time I'll look into porting the
removed tests to Linux.
I also noticed there's a small bug in patch 3/6 that broke xfs/073; I'll fix
that in v2. (Also, for easier review I'll probably use 'git format-patch -D' so
the mailing list doesn't eat the larger patches.)
Eric
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/6] xfstests: remove most IRIX-specific code
2017-06-02 1:25 ` Eric Biggers
@ 2017-06-02 2:54 ` Eryu Guan
0 siblings, 0 replies; 12+ messages in thread
From: Eryu Guan @ 2017-06-02 2:54 UTC (permalink / raw)
To: Eric Biggers; +Cc: Darrick J. Wong, fstests, Eric Biggers, linux-xfs
On Thu, Jun 01, 2017 at 06:25:11PM -0700, Eric Biggers wrote:
> On Thu, Jun 01, 2017 at 08:33:47AM -0700, Darrick J. Wong wrote:
> > On Thu, Jun 01, 2017 at 03:29:02PM +0800, Eryu Guan wrote:
> > > On Wed, May 31, 2017 at 08:29:04PM -0700, Eric Biggers wrote:
> > > > On Thu, Jun 01, 2017 at 11:12:35AM +0800, Eryu Guan wrote:
> > > > > On Wed, May 31, 2017 at 03:36:49PM -0700, Eric Biggers wrote:
> > > > > > From: Eric Biggers <ebiggers@google.com>
> > > > > >
> > > > > > 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 probably other examples of this bitrot too.
> > > > > >
> > > > > > Therefore, this patchset simplifies things removing IRIX support from
> > > > > > the xfstests tests, build system, and documentation.
> > > > > >
> > > > > > It focuses on making larger, more obvious cleanups. Of course,
> > > > > > there's more to do if people want to spend more time going through
> > > > > > some of the more intricate details, especially XFS-specific details.
> > > > > > But this should be a good start.
> > > > >
> > > > > Thanks a lot for doing this!! I didn't see patch #2 and #3 hit the list
> > > > > (too big for the list?). Do you have a public git repo that I can pull
> > > > > from?
> > > > >
> > > >
> > > > Ick, I guess the size limit must be 100K. I've pushed the series out to
> > > > repository https://github.com/ebiggers/xfstests, branch "remove_irix_support".
> > > >
> > > > Note that the two biggest patches can be more easily reviewed with
> > > > 'git diff -D', since that abbreviates the file deletions.
> > >
> > > Thanks!
> > >
> > > I also cc'ed linux-xfs list for review, as IRIX support is mainly for
> > > XFS.
> >
> > I think it's safe to drop IRIX support; xfsprogs dropped it in 4.10.
> >
> > That said, I also think "tests: remove IRIX-specific tests" removes too
> > many tests. generic/097 looks like a fairly generic xattr usage test,
> > why not just fix it to work on Linux (and sort the attrs to stabilize
> > the output)? Neither of the removed udf tests seem to test anything
> > Irix specific; either fix them to work with the Linux udf tools (or kill
> > udf/102).
> >
> > I looked through the rest of the patches in the branch and they looked
> > ok to me. Thanks for cleaning out that cruft.
> >
> > --D
> >
>
> Okay, thanks for the review. When I have time I'll look into porting the
> removed tests to Linux.
>
> I also noticed there's a small bug in patch 3/6 that broke xfs/073; I'll fix
I also noticed xfs/073 failure in my testing, but haven't digged into it.
> that in v2. (Also, for easier review I'll probably use 'git format-patch -D' so
> the mailing list doesn't eat the larger patches.)
>
> Eric
Thanks!
Eryu
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/6] xfstests: remove most IRIX-specific code
2017-06-01 15:33 ` Darrick J. Wong
2017-06-02 1:25 ` Eric Biggers
@ 2017-06-02 3:34 ` Eryu Guan
1 sibling, 0 replies; 12+ messages in thread
From: Eryu Guan @ 2017-06-02 3:34 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: Eric Biggers, fstests, Eric Biggers, linux-xfs
On Thu, Jun 01, 2017 at 08:33:47AM -0700, Darrick J. Wong wrote:
> On Thu, Jun 01, 2017 at 03:29:02PM +0800, Eryu Guan wrote:
> > On Wed, May 31, 2017 at 08:29:04PM -0700, Eric Biggers wrote:
> > > On Thu, Jun 01, 2017 at 11:12:35AM +0800, Eryu Guan wrote:
> > > > On Wed, May 31, 2017 at 03:36:49PM -0700, Eric Biggers wrote:
> > > > > From: Eric Biggers <ebiggers@google.com>
> > > > >
> > > > > 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 probably other examples of this bitrot too.
> > > > >
> > > > > Therefore, this patchset simplifies things removing IRIX support from
> > > > > the xfstests tests, build system, and documentation.
> > > > >
> > > > > It focuses on making larger, more obvious cleanups. Of course,
> > > > > there's more to do if people want to spend more time going through
> > > > > some of the more intricate details, especially XFS-specific details.
> > > > > But this should be a good start.
> > > >
> > > > Thanks a lot for doing this!! I didn't see patch #2 and #3 hit the list
> > > > (too big for the list?). Do you have a public git repo that I can pull
> > > > from?
> > > >
> > >
> > > Ick, I guess the size limit must be 100K. I've pushed the series out to
> > > repository https://github.com/ebiggers/xfstests, branch "remove_irix_support".
> > >
> > > Note that the two biggest patches can be more easily reviewed with
> > > 'git diff -D', since that abbreviates the file deletions.
> >
> > Thanks!
> >
> > I also cc'ed linux-xfs list for review, as IRIX support is mainly for
> > XFS.
>
> I think it's safe to drop IRIX support; xfsprogs dropped it in 4.10.
Then all tests will have "_supported_os Linux", maybe we can drop
_supported_os() all together, and remove it from 'new' template?
Perhaps adding a os check in 'check' and exit if os is not Linux.
(xfs/109 has '_supported_os Linux XFS', but I think that's a typo).
Thanks,
Eryu
>
> That said, I also think "tests: remove IRIX-specific tests" removes too
> many tests. generic/097 looks like a fairly generic xattr usage test,
> why not just fix it to work on Linux (and sort the attrs to stabilize
> the output)? Neither of the removed udf tests seem to test anything
> Irix specific; either fix them to work with the Linux udf tools (or kill
> udf/102).
>
> I looked through the rest of the patches in the branch and they looked
> ok to me. Thanks for cleaning out that cruft.
>
> --D
>
> >
> > Eryu
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 12+ messages in thread