From: Eric Biggers Date: Fri, 21 Jul 2017 04:22:05 +0000 (-0700) Subject: tests: clean up per-OS output files X-Git-Tag: v2022.05.01~1945 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=48a473b5da5088036827d26f9dfb19618fca2cf0;p=users%2Fhch%2Fxfstests-dev.git 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 Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/.gitignore b/.gitignore index c07364862..fcbc0cd49 100644 --- a/.gitignore +++ b/.gitignore @@ -234,19 +234,6 @@ /dmapi/src/suite2/src/test_rights # Symlinked files -/tests/generic/088.out -/tests/xfs/018.op -/tests/xfs/022.out -/tests/xfs/023.out -/tests/xfs/030.out -/tests/xfs/031.out /tests/xfs/033.out -/tests/xfs/035.out -/tests/xfs/036.out -/tests/xfs/039.out -/tests/xfs/043.out -/tests/xfs/055.out /tests/xfs/071.out -/tests/xfs/082.op /tests/xfs/096.out -/tests/xfs/146.out diff --git a/tests/generic/088 b/tests/generic/088 index 1f01c4f5f..8d31741b7 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 7fd51a7dc..000000000 --- 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 253af940f..b29138215 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 7fd51a7dc..000000000 --- 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 1cd6d28e5..ebe539ab9 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 7fd51a7dc..000000000 --- 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 d304384b4..fff49d563 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 7fd51a7dc..000000000 --- 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 4d8d7d678..bc807753d 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 7fd51a7dc..000000000 --- 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 678c32490..b05f28b0d 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 7fd51a7dc..000000000 --- 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 a6f93f297..321856fcd 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 768ca9e06..46df3b036 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 6b6c86b77..1fde45df1 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 7fd51a7dc..000000000 --- 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 c65523f5d..2a930b20d 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 7fd51a7dc..000000000 --- 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 62735906c..51d5544af 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 7fd51a7dc..000000000 --- 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 caca73dad..9bd6f1ec0 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 7fd51a7dc..000000000 --- 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 383058a5e..9f67e1766 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 f824d5efa..038783794 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 7fd51a7dc..000000000 --- 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 ea448db2e..9d93e951f 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 7fd51a7dc..000000000 --- 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