tests: clean up per-OS output files

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>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/.gitignore b/.gitignore
index c073648628610f1615338431ed2d080c090b2634..fcbc0cd4905428697867e03d42a3b9ef81805028 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -234,19 +234,6 @@
 /dmapi/src/suite2/src/test_rights
 
 # Symlinked files
-/tests/generic/088.out
-/tests/xfs/018.op
-/tests/xfs/022.out
-/tests/xfs/023.out
-/tests/xfs/030.out
-/tests/xfs/031.out
 /tests/xfs/033.out
-/tests/xfs/035.out
-/tests/xfs/036.out
-/tests/xfs/039.out
-/tests/xfs/043.out
-/tests/xfs/055.out
 /tests/xfs/071.out
-/tests/xfs/082.op
 /tests/xfs/096.out
-/tests/xfs/146.out

diff --git a/tests/generic/088 b/tests/generic/088
index 1f01c4f5f7001e374d3ed5f590080c7d510cf743..8d31741b7654cd40dac0cb022ac9b042f5d68873 100755 (executable)
--- 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 (file)
index 7fd51a7..0000000
--- 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 253af940fb66a46e906334c144a313493a9b844d..b291382150e8ba3447ee0ce9be2ece076a4d4468 100755 (executable)
--- 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 (file)
index 7fd51a7..0000000
--- 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 1cd6d28e5dfe0142494d86307eadb71554d2f77e..ebe539ab99793100ca56edd4feee6247e92d2ebd 100755 (executable)
--- 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 (file)
index 7fd51a7..0000000
--- 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 d304384b418b03793442155323f4631f5bef2dbe..fff49d563f443676d17c924b5b8565e99e8de360 100755 (executable)
--- 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 (file)
index 7fd51a7..0000000
--- 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 4d8d7d6786bfcd611dd292f17c1eec1ba744fe41..bc807753d5dd57b7522c17999810f817a978381d 100755 (executable)
--- 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 (file)
index 7fd51a7..0000000
--- 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 678c32490a2887db92acd267101311b9f7f94f6f..b05f28b0d74e3782a8e3959ed977b7ee83536262 100755 (executable)
--- 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 (file)
index 7fd51a7..0000000
--- 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 a6f93f29764189585e51e035230f783ff86b7e2e..321856fcdf60ce80db2fd337913d41b54054d632 100755 (executable)
--- 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 768ca9e06bcb33eefa135a3cdaf48017239b0165..46df3b036bf95c851d39b2f796a40f6dc2e6a2c4 100644 (file)
--- 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 6b6c86b776c37af5019d64893d4599dfc292d91d..1fde45df1e038d2b99182059da9049b91c6efad2 100755 (executable)
--- 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 (file)
index 7fd51a7..0000000
--- 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 c65523f5dac9a8744d86cdcafb451ba9eda12976..2a930b20d6d13fe72bca87c712c493ffebea42f7 100755 (executable)
--- 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 (file)
index 7fd51a7..0000000
--- 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 62735906c6f21f1f27740f1ea327ef7c2e12201d..51d5544aff16069d94a2d34abfedca86715d242d 100755 (executable)
--- 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 (file)
index 7fd51a7..0000000
--- 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 caca73dad93692709f04c07bd476336c07a54363..9bd6f1ec0efb99eaa1da69f35b3bb270c078ca3a 100755 (executable)
--- 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 (file)
index 7fd51a7..0000000
--- 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 383058a5ec0e99f5d35399530071ceaac4cbc657..9f67e176619337f2a1c128e7be474579e2e1129c 100755 (executable)
--- 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 f824d5efa611bca3c997d49ba92267c6da5d2afd..038783794752ae669750e387510610cecd726716 100755 (executable)
--- 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 (file)
index 7fd51a7..0000000
--- 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 ea448db2ef613afa6de52b254247de7557ee1460..9d93e951fdf3098eaa7748f4f4c543ebe907863b 100755 (executable)
--- 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 (file)
index 7fd51a7..0000000
--- 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