Skip to contentSkip to conversation

xfstests: remove most IRIX-specific code

PATCH In review Eric Biggers 3 participants 12 messages May 31, 2017 – Jun 2, 2017

lore
Share & tools
lore
#0 lore raw

cover xfstests: remove most IRIX-specific code

From: Eric Biggers <[email protected]>

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.

Eric Biggers (6):
README: remove IRIX-specific documentation
tests: remove IRIX-specific tests
tests: remove IRIX support from tests also supported on Linux
tests: clean up per-OS output files
common: remove IRIX-specific code
build: remove IRIX-specific build logic

 .gitignore                                   |   14 -
 README                                       |   51 +-
 common/attr                                  |    6 +-
 common/config                                |   12 -
 common/dump                                  |   39 +-
 common/filestreams                           |   43 +-
 common/log                                   |    1 -
 common/rc                                    |   23 +-
 configure.ac                                 |   59 +-
 include/builddefs.in                         |    3 -
 lib/str_to_bytes.c                           |    2 +-
 ltp/Makefile                                 |    4 -
 ltp/rwtest.sh                                |    1 -
 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 -
 src/fill2fs                                  |    3 +-
 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                            |    5 +-
 tests/generic/088.cfg                        |    2 -
 tests/generic/{088.out.linux => 088.out}     |    0
 tests/generic/088.out.irix                   |    9 -
 tests/generic/093                            |  158 -
 tests/generic/093.out                        |  Bin 917 -> 0 bytes
 tests/generic/096                            |    2 +-
 tests/generic/097                            |  250 --
 tests/generic/097.out.udf                    |  132 -
 tests/generic/097.out.xfs                    |  132 -
 tests/generic/099                            |  331 --
 tests/generic/099.out                        |  215 -
 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/generic/group                          |    3 -
 tests/udf/098                                |  274 --
 tests/udf/098.out                            | 1594 --------
 tests/udf/101                                |   62 -
 tests/udf/101.out                            |   19 -
 tests/udf/102                                |    2 +-
 tests/udf/group                              |    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                                |   11 +-
 tests/xfs/018.cfg                            |    2 -
 tests/xfs/{018.op.linux => 018.op}           |    0
 tests/xfs/018.op.irix                        | 5628 --------------------------
 tests/xfs/019                                |    2 +-
 tests/xfs/022                                |    8 +-
 tests/xfs/022.cfg                            |    2 -
 tests/xfs/{022.out.linux => 022.out}         |    0
 tests/xfs/022.out.irix                       |   55 -
 tests/xfs/023                                |    5 +-
 tests/xfs/023.cfg                            |    2 -
 tests/xfs/{023.out.linux => 023.out}         |    0
 tests/xfs/023.out.irix                       |   89 -
 tests/xfs/026                                |    2 +-
 tests/xfs/027                                |    2 +-
 tests/xfs/028                                |    2 +-
 tests/xfs/030                                |    5 +-
 tests/xfs/030.cfg                            |    2 -
 tests/xfs/{030.out.linux => 030.out}         |    0
 tests/xfs/030.out.irix                       |  288 --
 tests/xfs/031                                |    5 +-
 tests/xfs/031.cfg                            |    2 -
 tests/xfs/{031.out.linux => 031.out}         |    0
 tests/xfs/031.out.irix                       |  123 -
 tests/xfs/032                                |    2 +-
 tests/xfs/033                                |    6 +-
 tests/xfs/033.cfg                            |    4 +-
 tests/xfs/{033.out.crc.linux => 033.out.crc} |    0
 tests/xfs/{033.out.linux => 033.out.default} |    0
 tests/xfs/033.out.irix                       |  217 -
 tests/xfs/035                                |    5 +-
 tests/xfs/035.cfg                            |    2 -
 tests/xfs/{035.out.linux => 035.out}         |    0
 tests/xfs/035.out.irix                       |   94 -
 tests/xfs/036                                |    5 +-
 tests/xfs/036.cfg                            |    2 -
 tests/xfs/{036.out.linux => 036.out}         |    0
 tests/xfs/036.out.irix                       |   86 -
 tests/xfs/039                                |    5 +-
 tests/xfs/039.cfg                            |    2 -
 tests/xfs/{039.out.linux => 039.out}         |    0
 tests/xfs/039.out.irix                       |   89 -
 tests/xfs/041                                |    2 +-
 tests/xfs/042                                |    2 +-
 tests/xfs/043                                |    5 +-
 tests/xfs/043.cfg                            |    2 -
 tests/xfs/{043.out.linux => 043.out}         |    0
 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                                |    5 +-
 tests/xfs/{055.out.linux => 055.out}         |    0
 tests/xfs/055.out.irix                       |   89 -
 tests/xfs/056                                |    2 +-
 tests/xfs/057                                |   47 -
 tests/xfs/057.out                            |   34 -
 tests/xfs/058                                |   46 -
 tests/xfs/058.out                            |  243 --
 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                                |   11 +-
 tests/xfs/082.cfg                            |    2 -
 tests/xfs/{082.op.linux => 082.op}           |    0
 tests/xfs/082.op.irix                        | 5628 --------------------------
 tests/xfs/084                                |   10 +-
 tests/xfs/092                                |    2 +-
 tests/xfs/094                                |    2 +-
 tests/xfs/095                                |   69 -
 tests/xfs/095.out                            |    6 -
 tests/xfs/096                                |    2 +-
 tests/xfs/103                                |    2 +-
 tests/xfs/107                                |    2 +-
 tests/xfs/108                                |    2 +-
 tests/xfs/114                                |  340 --
 tests/xfs/114.out                            |  365 --
 tests/xfs/115                                |  257 --
 tests/xfs/115.out                            |  118 -
 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                                |    5 +-
 tests/xfs/146.cfg                            |    2 -
 tests/xfs/{146.out.linux => 146.out}         |    0
 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 +-
 tests/xfs/group                              |    5 -
 240 files changed, 245 insertions(+), 18195 deletions(-)
 delete mode 100755 make_irix
 delete mode 100644 tests/generic/088.cfg
 rename tests/generic/{088.out.linux => 088.out} (100%)
 delete mode 100644 tests/generic/088.out.irix
 delete mode 100755 tests/generic/093
 delete mode 100644 tests/generic/093.out
 delete mode 100755 tests/generic/097
 delete mode 100644 tests/generic/097.out.udf
 delete mode 100644 tests/generic/097.out.xfs
 delete mode 100755 tests/generic/099
 delete mode 100644 tests/generic/099.out
 delete mode 100755 tests/udf/098
 delete mode 100644 tests/udf/098.out
 delete mode 100755 tests/udf/101
 delete mode 100644 tests/udf/101.out
 delete mode 100644 tests/xfs/018.cfg
 rename tests/xfs/{018.op.linux => 018.op} (100%)
 delete mode 100644 tests/xfs/018.op.irix
 delete mode 100644 tests/xfs/022.cfg
 rename tests/xfs/{022.out.linux => 022.out} (100%)
 delete mode 100644 tests/xfs/022.out.irix
 delete mode 100644 tests/xfs/023.cfg
 rename tests/xfs/{023.out.linux => 023.out} (100%)
 delete mode 100644 tests/xfs/023.out.irix
 delete mode 100644 tests/xfs/030.cfg
 rename tests/xfs/{030.out.linux => 030.out} (100%)
 delete mode 100644 tests/xfs/030.out.irix
 delete mode 100644 tests/xfs/031.cfg
 rename tests/xfs/{031.out.linux => 031.out} (100%)
 delete mode 100644 tests/xfs/031.out.irix
 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/033.out.irix
 delete mode 100644 tests/xfs/035.cfg
 rename tests/xfs/{035.out.linux => 035.out} (100%)
 delete mode 100644 tests/xfs/035.out.irix
 delete mode 100644 tests/xfs/036.cfg
 rename tests/xfs/{036.out.linux => 036.out} (100%)
 delete mode 100644 tests/xfs/036.out.irix
 delete mode 100644 tests/xfs/039.cfg
 rename tests/xfs/{039.out.linux => 039.out} (100%)
 delete mode 100644 tests/xfs/039.out.irix
 delete mode 100644 tests/xfs/043.cfg
 rename tests/xfs/{043.out.linux => 043.out} (100%)
 delete mode 100644 tests/xfs/043.out.irix
 rename tests/xfs/{055.out.linux => 055.out} (100%)
 delete mode 100644 tests/xfs/055.out.irix
 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
 delete mode 100644 tests/xfs/082.cfg
 rename tests/xfs/{082.op.linux => 082.op} (100%)
 delete mode 100644 tests/xfs/082.op.irix
 delete mode 100755 tests/xfs/095
 delete mode 100644 tests/xfs/095.out
 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
 delete mode 100644 tests/xfs/146.cfg
 rename tests/xfs/{146.out.linux => 146.out} (100%)
 delete mode 100644 tests/xfs/146.out.irix
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
#1 lore raw

PATCH 1/6 README: remove IRIX-specific documentation

From: Eric Biggers <[email protected]>

xfstests is no longer supported on IRIX, so remove the IRIX-specific instructions for building and running xfstests.

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

PATCH 4/6 tests: clean up per-OS output files

In reply to Eric Biggers

From: Eric Biggers <[email protected]>

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.

---
 .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%)
.gitignore +0 -13
index 388f5af3..feeaed45 100644
@@ -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
tests/generic/088 +0 -3
index 1f01c4f5..8d31741b 100755
@@ -42,9 +42,6 @@ _filter()
     _filter_test_dir | sed -e '/----------/d'
 }
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
tests/generic/088.cfg deleted +0 -1
deleted file mode 100644
index 7fd51a7d..00000000
@@ -1 +0,0 @@
-linux: linux
tests/generic/088.out renamed from tests/generic/088.out.linux +0 -0
similarity index 100%
rename from tests/generic/088.out.linux
rename to tests/generic/088.out
tests/xfs/018 +0 -3
index 253af940..b2913821 100755
@@ -53,9 +53,6 @@ rm -f $seqres.full $tmp.*
 _require_scratch
 _require_v2log
 
-# link correct .out file
-_link_out_file_named $seqfull.op $(_get_os_name)
-
 echo "*** init FS"
 _scratch_unmount >/dev/null 2>&1
 
tests/xfs/018.cfg deleted +0 -1
deleted file mode 100644
index 7fd51a7d..00000000
@@ -1 +0,0 @@
-linux: linux
tests/xfs/018.op renamed from tests/xfs/018.op.linux +0 -0
similarity index 100%
rename from tests/xfs/018.op.linux
rename to tests/xfs/018.op
tests/xfs/022 +0 -3
index 1cd6d28e..ebe539ab 100755
@@ -38,9 +38,6 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
tests/xfs/022.cfg deleted +0 -1
deleted file mode 100644
index 7fd51a7d..00000000
@@ -1 +0,0 @@
-linux: linux
tests/xfs/022.out renamed from tests/xfs/022.out.linux +0 -0
similarity index 100%
rename from tests/xfs/022.out.linux
rename to tests/xfs/022.out
tests/xfs/023 +0 -3
index d304384b..fff49d56 100755
@@ -37,9 +37,6 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
tests/xfs/023.cfg deleted +0 -1
deleted file mode 100644
index 7fd51a7d..00000000
@@ -1 +0,0 @@
-linux: linux
tests/xfs/023.out renamed from tests/xfs/023.out.linux +0 -0
similarity index 100%
rename from tests/xfs/023.out.linux
rename to tests/xfs/023.out
tests/xfs/030 +0 -3
index 4d8d7d67..bc807753 100755
@@ -45,9 +45,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common/filter
 . ./common/repair
 
-# link correct .out file
-_link_out_file
-
 # nuke the superblock, AGI, AGF, AGFL; then try repair the damage
 #
 _check_ag()
tests/xfs/030.cfg deleted +0 -1
deleted file mode 100644
index 7fd51a7d..00000000
@@ -1 +0,0 @@
-linux: linux
tests/xfs/030.out renamed from tests/xfs/030.out.linux +0 -0
similarity index 100%
rename from tests/xfs/030.out.linux
rename to tests/xfs/030.out
tests/xfs/031 +0 -3
index 678c3249..b05f28b0 100755
@@ -38,9 +38,6 @@ rm -f $seqres.full
 . ./common/repair
 . ./common/filter
 
-# link correct .out file
-_link_out_file
-
 _check_repair()
 {
 	echo "Repairing, round 0" >> $seqres.full
tests/xfs/031.cfg deleted +0 -1
deleted file mode 100644
index 7fd51a7d..00000000
@@ -1 +0,0 @@
-linux: linux
tests/xfs/031.out renamed from tests/xfs/031.out.linux +0 -0
similarity index 100%
rename from tests/xfs/031.out.linux
rename to tests/xfs/031.out
tests/xfs/033 +2 -2
index a6f93f29..321856fc 100755
@@ -86,9 +86,9 @@ if [ $isize -lt 512 ]; then
 fi
 
 # link correct .out file
-FEATURES=$(_get_os_name)
+FEATURES=
 if [ $_fs_has_crcs -eq 1 ]; then
-	FEATURES=$FEATURES,crc
+	FEATURES=crc
 fi
 _link_out_file_named $seqfull.out "$FEATURES"
 
tests/xfs/033.cfg +1 -2
index 768ca9e0..46df3b03 100644
@@ -1,2 +1 @@
-linux,crc: crc.linux
-linux: linux
+crc: crc
tests/xfs/033.out.crc renamed from tests/xfs/033.out.crc.linux +0 -0
similarity index 100%
rename from tests/xfs/033.out.crc.linux
rename to tests/xfs/033.out.crc
tests/xfs/033.out.default renamed from tests/xfs/033.out.linux +0 -0
similarity index 100%
rename from tests/xfs/033.out.linux
rename to tests/xfs/033.out.default
tests/xfs/035 +0 -3
index 6b6c86b7..1fde45df 100755
@@ -36,9 +36,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
tests/xfs/035.cfg deleted +0 -1
deleted file mode 100644
index 7fd51a7d..00000000
@@ -1 +0,0 @@
-linux: linux
tests/xfs/035.out renamed from tests/xfs/035.out.linux +0 -0
similarity index 100%
rename from tests/xfs/035.out.linux
rename to tests/xfs/035.out
tests/xfs/036 +0 -3
index c65523f5..2a930b20 100755
@@ -36,9 +36,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
tests/xfs/036.cfg deleted +0 -1
deleted file mode 100644
index 7fd51a7d..00000000
@@ -1 +0,0 @@
-linux: linux
tests/xfs/036.out renamed from tests/xfs/036.out.linux +0 -0
similarity index 100%
rename from tests/xfs/036.out.linux
rename to tests/xfs/036.out
tests/xfs/039 +0 -3
index 62735906..51d5544a 100755
@@ -36,9 +36,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
tests/xfs/039.cfg deleted +0 -1
deleted file mode 100644
index 7fd51a7d..00000000
@@ -1 +0,0 @@
-linux: linux
tests/xfs/039.out renamed from tests/xfs/039.out.linux +0 -0
similarity index 100%
rename from tests/xfs/039.out.linux
rename to tests/xfs/039.out
tests/xfs/043 +0 -3
index caca73da..9bd6f1ec 100755
@@ -38,9 +38,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
tests/xfs/043.cfg deleted +0 -1
deleted file mode 100644
index 7fd51a7d..00000000
@@ -1 +0,0 @@
-linux: linux
tests/xfs/043.out renamed from tests/xfs/043.out.linux +0 -0
similarity index 100%
rename from tests/xfs/043.out.linux
rename to tests/xfs/043.out
tests/xfs/055 +0 -3
index 383058a5..9f67e176 100755
@@ -36,9 +36,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/rc
 . ./common/dump
 
-# link correct .out file
-_link_out_file
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
tests/xfs/055.out renamed from tests/xfs/055.out.linux +0 -0
similarity index 100%
rename from tests/xfs/055.out.linux
rename to tests/xfs/055.out
tests/xfs/082 +0 -3
index f824d5ef..03878379 100755
@@ -54,9 +54,6 @@ rm -f $seqres.full $tmp.*
 _require_scratch
 _require_v2log 
 
-# link correct .out file
-_link_out_file_named $seqfull.op $(_get_os_name)
-
 echo "*** init FS"
 _scratch_unmount >/dev/null 2>&1
 
tests/xfs/082.cfg deleted +0 -1
deleted file mode 100644
index 7fd51a7d..00000000
@@ -1 +0,0 @@
-linux: linux
tests/xfs/082.op renamed from tests/xfs/082.op.linux +0 -0
similarity index 100%
rename from tests/xfs/082.op.linux
rename to tests/xfs/082.op
tests/xfs/146 +0 -3
index ea448db2..9d93e951 100755
@@ -47,9 +47,6 @@ _report_filter () {
 _supported_fs xfs
 _supported_os Linux
 
-# link correct .out file
-_link_out_file
-
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1
 _dmapi_scratch_mount
tests/xfs/146.cfg deleted +0 -1
deleted file mode 100644
index 7fd51a7d..00000000
@@ -1 +0,0 @@
-linux: linux
tests/xfs/146.out renamed from tests/xfs/146.out.linux +0 -0
similarity index 100%
rename from tests/xfs/146.out.linux
rename to tests/xfs/146.out
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
#3 lore raw

PATCH 5/6 common: remove IRIX-specific code

In reply to Eric Biggers

From: Eric Biggers <[email protected]>

As xfstests is no longer supported on IRIX, remove IRIX-specific code from the common helper scripts.

---
 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(-)
common/attr +1 -5
index c840ce42..42a197fe 100644
@@ -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
common/config +0 -12
index 090e9117..09237519 100644
@@ -52,15 +52,10 @@
 export LANG=C
 export LC_ALL=C
 
-# Warning: don't put freeware before /usr/bsd on IRIX coz you'll
-#  get the wrong hostname and set your system name to -s  :)
-[ -d /usr/bsd ] && PATH=$PATH:/usr/bsd
-[ -d /usr/freeware/bin ] && PATH=$PATH:/usr/freeware/bin
 PATH=".:$PATH"
 
 export HOST=`hostname -s`
 export HOSTOS=`uname -s`
-[ "$HOSTOS" = "IRIX64" ] && export HOSTOS="IRIX"
 
 export MODULAR=0               # using XFS as a module or not
 export BOOT="/boot"            # install target for kernels
@@ -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`"
common/dump +3 -36
index d6663e0c..b0e4a12f 100644
@@ -395,8 +395,6 @@ End-of-File
 
 _mk_fillconfig_perm()
 {
-    # dir_guid: ugo=rwx,g+s on dir is for IRIX chmod(1)
-
     cat <<End-of-File >$tmp.config
 # pathname	size/dir  user group mode
 #
@@ -406,7 +404,7 @@ file_sticky	10	$nobody	$nobody	01777
 file_mix1	10	$nobody	$nobody	761
 file_mix2	10	$nobody	$nobody	642
 dir_suid	d	$nobody	$nobody	04777
-dir_guid	d	$nobody	$nobody	ugo=rwx,g+s
+dir_guid	d	$nobody	$nobody	02777
 dir_sticky	d	$nobody	$nobody	01777
 dir_mix1	d	$nobody	$nobody	761
 dir_mix2	d	$nobody	$nobody	642
@@ -798,25 +796,6 @@ _ls_filter()
   | sed -e 's/total [0-9][0-9]*/total TOTAL/'
 }
 
-#
-# Filtering of Irix character hwgraph device names
-# e.g.
-# chardev: /hw/node/xtalk/15/pci/0/scsi_ctlr/0/target/1/lun/0/disk/partition/4/char
-# blkdev:  /dev/dsk/dks0d1s4
-#
-_filter_devchar()
-{
-    $AWK_PROG '
-	/\/hw\/node/ {
-	    sub(/\/hw.*scsi_ctlr\//,"/dev/dsk/dks")  # blah blah /dev/dsk/dks0/target/1/....
-	    sub(/\/target\//,"d")                    # blah blah /dev/dsk/dks0d1/lun/0/disk.....
-	    sub(/\/lun.*partition\//,"s")            # blah blah /dev/dsk/dks0d1s4/char
-	    sub(/\/char/,"")			     # blah blah /dev/dsk/dks0d1s4
-	}
-	{ print }
-    '
-}
-
 
 #
 # Filter out the non-deterministic dump msgs from
@@ -824,7 +803,6 @@ _filter_devchar()
 #
 _dump_filter_main()
 {
-  _filter_devchar |\
   sed \
       -e "s#$__XFSDUMP_PROG#xfsdump#"			\
       -e "s#$XFSRESTORE_PROG#xfsrestore#"		\
@@ -1191,7 +1169,7 @@ _do_restore_toc()
     echo "Contents of dump ..."
     opts="$_restore_debug$restore_args -f $dump_file -t"
     echo "xfsrestore $opts" | _dir_filter
-    cd $SCRATCH_MNT # for IRIX which needs xfs cwd
+    cd $SCRATCH_MNT
     $XFSRESTORE_PROG $opts 2>&1 | tee -a $seqres.full | _dump_filter_main |\
     _check_quota_file |\
     _check_quota_entries |\
@@ -1484,25 +1462,14 @@ _check_quota_entries()
 # xfsrestore: user quota information written to ...'
 # xfsrestore: group quota information written to ...'
 # xfsrestore: project quota information written to ...'
-#
-# If on IRIX then look for:
-# xfsrestore: use 'edquota' to restore quotas
-# Else look for:
 # xfsrestore: use 'xfs_quota' to restore quotas
 #
 _check_quota_dumprestore()
 {
-    if [ "$HOSTOS" == "IRIX" ]; then
 	_check_quota 'user quota information' \
 		     'group quota information' \
 		     'project quota information' | \
-	sed "/xfsrestore:.*use 'edquota' to restore quotas/d"
-    else
-	_check_quota 'user quota information' \
-		     'group quota information' \
-		     'project quota information' | \
-	sed "/xfsrestore:.*use 'xfs_quota' to restore quotas/d"
-    fi
+		sed "/xfsrestore:.*use 'xfs_quota' to restore quotas/d"
 }
 
 #
common/filestreams +6 -37

70 lines not on this page · raw message

common/log +0 -1
index d1c19ff5..bdb4ed68 100644
@@ -314,7 +314,6 @@ _print_operation()
 # and may not match with the FS mounted at a different LR size 
 # => xlog_do_recovery_pass() can not handle the different hdr sizes
 #    it assumes them all to be the same between the start..finish
-# NB: On IRIX there is no UMOUNT record and so we could start from -s 0.
 
 _print_transaction_inode()
 {
common/rc +3 -20
index 743df427..346b23af 100644
@@ -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
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
#4 lore raw

PATCH 6/6 build: remove IRIX-specific build logic

In reply to Eric Biggers

From: Eric Biggers <[email protected]>

As xfstests is no longer supported on IRIX, remove the ability to build xfstests for IRIX.

---
 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
configure.ac +23 -36
index 843ff6b6..57092f1c 100644
@@ -42,45 +42,32 @@ AC_CHECK_HEADERS([xfs/xfs_log_format.h],,,[
 
 AC_PACKAGE_NEED_UUIDCOMPARE
 
-case $pkg_platform
-in
-	irix)
-		AC_PACKAGE_NEED_SYS_ACL_H
-		AC_PACKAGE_NEED_ATTRIBUTES_H
-		AC_PACKAGE_WANT_NDBM
-		AC_PACKAGE_NEED_IRIX_LIBHANDLE
-		have_attr_list=true
-		AC_SUBST(have_attr_list)
-		;;
-	*)
-		AC_MULTILIB($enable_lib64)
-		AC_PACKAGE_NEED_XFS_XFS_H
-		AC_PACKAGE_WANT_LIBXFS_H
-		AC_PACKAGE_WANT_XLOG_ASSIGN_LSN
-		AC_PACKAGE_NEED_XFS_XQM_H
-		AC_PACKAGE_NEED_XFSCTL_MACRO
-		AC_PACKAGE_NEED_XFS_HANDLE_H
+AC_MULTILIB($enable_lib64)
+AC_PACKAGE_NEED_XFS_XFS_H
+AC_PACKAGE_WANT_LIBXFS_H
+AC_PACKAGE_WANT_XLOG_ASSIGN_LSN
+AC_PACKAGE_NEED_XFS_XQM_H
+AC_PACKAGE_NEED_XFSCTL_MACRO
+AC_PACKAGE_NEED_XFS_HANDLE_H
 
-		AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE
-		AC_PACKAGE_NEED_ATTR_XATTR_H
-		AC_PACKAGE_NEED_ATTRIBUTES_H
-		AC_PACKAGE_WANT_ATTRLIST_LIBATTR
-		AC_PACKAGE_NEED_GETXATTR_LIBATTR
+AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE
+AC_PACKAGE_NEED_ATTR_XATTR_H
+AC_PACKAGE_NEED_ATTRIBUTES_H
+AC_PACKAGE_WANT_ATTRLIST_LIBATTR
+AC_PACKAGE_NEED_GETXATTR_LIBATTR
 
-		AC_PACKAGE_NEED_SYS_ACL_H
-		AC_PACKAGE_NEED_ACL_LIBACL_H
-		AC_PACKAGE_NEED_ACLINIT_LIBACL
+AC_PACKAGE_NEED_SYS_ACL_H
+AC_PACKAGE_NEED_ACL_LIBACL_H
+AC_PACKAGE_NEED_ACLINIT_LIBACL
 
-		AC_PACKAGE_WANT_GDBM
-		AC_PACKAGE_WANT_AIO
-		AC_PACKAGE_WANT_DMAPI
-		AC_PACKAGE_WANT_LINUX_FIEMAP_H
-		AC_PACKAGE_WANT_FALLOCATE
-		AC_PACKAGE_WANT_OPEN_BY_HANDLE_AT
-		AC_PACKAGE_WANT_LINUX_PRCTL_H
-		AC_PACKAGE_WANT_LINUX_FS_H
-		;;
-esac
+AC_PACKAGE_WANT_GDBM
+AC_PACKAGE_WANT_AIO
+AC_PACKAGE_WANT_DMAPI
+AC_PACKAGE_WANT_LINUX_FIEMAP_H
+AC_PACKAGE_WANT_FALLOCATE
+AC_PACKAGE_WANT_OPEN_BY_HANDLE_AT
+AC_PACKAGE_WANT_LINUX_PRCTL_H
+AC_PACKAGE_WANT_LINUX_FS_H
 
 AC_CHECK_FUNCS([renameat2])
 
include/builddefs.in +0 -3
index 38fb9c60..cb52b99a 100644
@@ -76,9 +76,6 @@ endif
 ifeq ($(PKG_PLATFORM),darwin)
 PCFLAGS = -traditional-cpp $(GCCFLAGS)
 endif
-ifeq ($(PKG_PLATFORM),irix)
-PCFLAGS = -nostdinc -I$(ROOT)/usr/include -I$(TOPDIR)/../irix/include
-endif
 ifeq ($(PKG_PLATFORM),freebsd)
 endif
 
ltp/Makefile +0 -4
index 5bea4927..eed83f48 100644
@@ -17,10 +17,6 @@ ifeq ($(HAVE_ATTR_LIST), true)
 LCFLAGS += -DHAVE_ATTR_LIST
 LLDLIBS += $(LIBATTR)
 endif
-ifeq ($(PKG_PLATFORM),irix)
-LCFLAGS += -DHAVE_ATTR_LIST
-LLDLIBS += $(LIBATTR)
-endif
 
 ifeq ($(HAVE_AIO), true)
 TARGETS += aio-stress
m4/package_globals.m4 +1 -1
index 72fbbb78..ce7a8c51 100644
@@ -39,7 +39,7 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
     AC_SUBST(pkg_distribution)
 
-    pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'`
+    pkg_platform=`uname -s | tr 'A-Z' 'a-z'`
     test -z "$PLATFORM" || pkg_platform="$PLATFORM"
     AC_SUBST(pkg_platform)
   ])
m4/package_libcdev.m4 +1 -1
index 5156ced6..fb123f33 100644
@@ -67,7 +67,7 @@ AC_DEFUN([AC_HAVE_SENDFILE],
   ])
 
 #
-# Check if we have a getmntent libc call (IRIX, Linux)
+# Check if we have a getmntent libc call (Linux)
 #
 AC_DEFUN([AC_HAVE_GETMNTENT],
   [ AC_MSG_CHECKING([for getmntent ])
m4/package_utilies.m4 +7 -7
index 726406c8..108ef455 100644
@@ -41,7 +41,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
     AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
 
     if test -z "$MAKE"; then
-        AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+        AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin)
     fi
     if test -z "$MAKE"; then
         AC_PATH_PROG(MAKE, make,, /usr/bin)
@@ -54,19 +54,19 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
 	AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
     fi
     if test -z "$LIBTOOL"; then
-	AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+	AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin)
     fi
     libtool=$LIBTOOL
     AC_SUBST(libtool)
     AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
 
     if test -z "$TAR"; then
-        AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
+        AC_PATH_PROG(TAR, tar,, /bin:/usr/local/bin:/usr/bin)
     fi
     tar=$TAR
     AC_SUBST(tar)
     if test -z "$ZIP"; then
-        AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
+        AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin)
     fi
 
     zip=$ZIP
@@ -108,14 +108,14 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
 
     if test "$enable_gettext" = yes; then
         if test -z "$MSGFMT"; then
-                AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+                AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin)
         fi
         msgfmt=$MSGFMT
         AC_SUBST(msgfmt)
         AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
 
         if test -z "$MSGMERGE"; then
-                AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+                AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin)
         fi
         msgmerge=$MSGMERGE
         AC_SUBST(msgmerge)
@@ -123,7 +123,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
     fi
 
     if test -z "$RPM"; then
-        AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
+        AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin)
     fi
     rpm=$RPM
     AC_SUBST(rpm)
m4/package_xfslibs.m4 +0 -13
index 5588e9ed..9be56e11 100644
@@ -92,19 +92,6 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE],
     AC_SUBST(libhdl)
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_IRIX_LIBHANDLE],
-  [ 
-    AC_MSG_CHECKING([libhandle.a for IRIX])
-    libhdl="`pwd`/../irix/libhandle/libhandle.a"
-    if ! test -f $libhdl; then
-	echo 'no'
-        echo 'FATAL ERROR: could not find IRIX XFS handle library.'
-        exit 1
-    fi
-    echo 'yes'
-    AC_SUBST(libhdl)
-  ])
-
 AC_DEFUN([AC_PACKAGE_NEED_XFSCTL_MACRO],
   [ AC_MSG_CHECKING([xfsctl from xfs/xfs.h])
     AC_TRY_LINK([
make_irix deleted +0 -114

114 lines not on this page · raw message

src/Makefile +0 -4
index 4ec01975..5c87c29c 100644
@@ -49,10 +49,6 @@ ifeq ($(PKG_PLATFORM),linux)
 TARGETS += $(LINUX_TARGETS)
 endif
 
-ifeq ($(PKG_PLATFORM),irix)
-LLDLIBS += -lgen
-endif
-
 ifeq ($(HAVE_DB), true)
 TARGETS += dbtest
 LLDLIBS += $(LIBGDBM)
Signature · 1 line
2.13.0.506.g27d5fe0cd-goog
#5 lore raw
In reply to Eric Biggers
Quoted 8 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Quoted 7 lines

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

#6 lore raw
Quoted 12 lines · Eryu Guan
Quoted 11 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Quoted 9 lines
Quoted 4 lines

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

#7 lore raw
Quoted 23 lines · Eric Biggers
Quoted 12 lines · Eryu Guan
Quoted 11 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Quoted 9 lines
Quoted 4 lines

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?

Quoted 5 lines

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

#8 lore raw
Quoted 27 lines · Eryu Guan
Quoted 26 lines · Eric Biggers
Quoted 12 lines · Eryu Guan
Quoted 11 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Quoted 9 lines
Quoted 4 lines

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".

Quoted 7 lines
Quoted 2 lines

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

Quoted 6 lines

Eryu
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#9 lore raw
Quoted 45 lines · Darrick J. Wong
Quoted 27 lines · Eryu Guan
Quoted 26 lines · Eric Biggers
Quoted 12 lines · Eryu Guan
Quoted 11 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Quoted 9 lines
Quoted 4 lines

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".

Quoted 7 lines
Quoted 2 lines

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).

Quoted 5 lines

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

#10 lore raw
Quoted 49 lines · Eric Biggers
Quoted 48 lines · Darrick J. Wong
Quoted 27 lines · Eryu Guan
Quoted 26 lines · Eric Biggers
Quoted 12 lines · Eryu Guan
Quoted 11 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Quoted 9 lines
Quoted 4 lines

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".

Quoted 7 lines
Quoted 2 lines

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.

Quoted 7 lines
Quoted 2 lines

--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.

Quoted 4 lines

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

#11 lore raw
In reply to Darrick J. Wong
Quoted 31 lines · Darrick J. Wong
Quoted 30 lines · Eryu Guan
Quoted 28 lines · Eric Biggers
Quoted 12 lines · Eryu Guan
Quoted 11 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Quoted 9 lines
Quoted 4 lines

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.

Quoted 6 lines
Quoted 4 lines

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

Quoted 19 lines

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

Quoted 6 lines

Eryu
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html