common: Improve _link_output_file to be more versatile

Currently _link_output_file() selects output file suffix based on the
current operating system. Make it more versatile by allowing selection
of output file suffix based on any feature string. The idea is that
in config file ($seq.cfg) there are several lines like:

feat1,feat2: suffix

The function is passed a feature string (or uses os_name,MOUNT_OPTIONS
if no argument is passed) and selects output file with a suffix for
which all features are present in the feature string. If there is no
matching line, output with 'default' suffix is selected.

Update all tests using _link_out_file to the new calling convention.

Signed-off-by: Jan Kara <jack@suse.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/common/rc b/common/rc
index c2b20da79bad11496cc7229f853382ea67fa1e3a..5b78b7b8a0abb3c140e56e2764ed7b44dff8e680 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -2200,15 +2200,52 @@ _get_os_name()
        fi
 }
 
+_link_out_file_named()
+{
+       export FEATURES=$2
+       SUFFIX=$(perl -e '
+               my %feathash;
+               my $feature, $result, $suffix, $opts;
+
+               foreach $feature (split(/,/, $ENV{"FEATURES"})) {
+                       $feathash{$feature} = 1;
+               }
+               $result = "default";
+               while (<>) {
+                       my $found = 1;
+
+                       chomp;
+                       ($opts, $suffix) = split(/ *: */);
+                       foreach my $opt (split(/,/, $opts)) {
+                               if (!exists($feathash{$opt})) {
+                                       $found = 0;
+                                       last;
+                               }
+                       }
+                       if ($found == 1) {
+                               $result = $suffix;
+                               last;
+                       }
+               }
+               print $result
+               ' <$seqfull.cfg)
+       rm -f $1
+       SRC=$(basename $1)
+       ln -fs $SRC.$SUFFIX $1
+}
+
 _link_out_file()
 {
-       if [ -z "$1" -o -z "$2" ]; then
-               echo Error must pass src and dst.
-               exit
+       if [ $# -eq 0 ]; then
+               FEATURES="$(_get_os_name)"
+               if [ -n "$MOUNT_OPTIONS" ]; then
+                       FEATURES=$FEATURES,${MOUNT_OPTIONS##"-o "}
+               fi
+       else
+               FEATURES=$1
        fi
-       rm -f $2
-       SUFFIX=$(_get_os_name())
-       ln -s $1.$SUFFIX $2
+
+       _link_out_file_named $seqfull.out "$FEATURES"
 }
 
 _die()

diff --git a/tests/generic/088 b/tests/generic/088
index 983de983c0599173c35795e7a289a64836310955..46ce6ae4e25d4af94783c6709f9c9ef98a62d608 100755 (executable)
--- a/tests/generic/088
+++ b/tests/generic/088
@@ -43,7 +43,7 @@ _filter()
 }
 
 # link correct .out file
-_link_out_file $seq.out $seqfull.out
+_link_out_file
 
 # real QA test starts here
 _supported_fs generic

diff --git a/tests/generic/088.cfg b/tests/generic/088.cfg
new file mode 100644 (file)
index 0000000..7ffdfc0
--- /dev/null
+++ b/tests/generic/088.cfg
@@ -0,0 +1,2 @@
+irix: irix
+linux: linux

diff --git a/tests/xfs/018 b/tests/xfs/018
index f097b283207ef574e35533a63b6a181e904d199a..848981f87ff431f1ca8a517d18cf32a2035208c5 100755 (executable)
--- a/tests/xfs/018
+++ b/tests/xfs/018
@@ -54,7 +54,7 @@ _require_scratch
 _require_v2log
 
 # link correct .out file
-_link_out_file $seq.op $seqfull.op
+_link_out_file_named $seqfull.op $(_get_os_name)
 
 echo "*** init FS"
 umount $SCRATCH_DEV >/dev/null 2>&1

diff --git a/tests/xfs/018.cfg b/tests/xfs/018.cfg
new file mode 100644 (file)
index 0000000..7ffdfc0
--- /dev/null
+++ b/tests/xfs/018.cfg
@@ -0,0 +1,2 @@
+irix: irix
+linux: linux

diff --git a/tests/xfs/022 b/tests/xfs/022
index cd9b9ec18c5e36f83422ca39eece0dc5499960d7..b2b6142cb2854b9221343f058b7a60b80216bcce 100755 (executable)
--- a/tests/xfs/022
+++ b/tests/xfs/022
@@ -39,7 +39,7 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/dump
 
 # link correct .out file
-_link_out_file $seq.out $seqfull.out
+_link_out_file
 
 # real QA test starts here
 _supported_fs xfs

diff --git a/tests/xfs/022.cfg b/tests/xfs/022.cfg
new file mode 100644 (file)
index 0000000..7ffdfc0
--- /dev/null
+++ b/tests/xfs/022.cfg
@@ -0,0 +1,2 @@
+irix: irix
+linux: linux

diff --git a/tests/xfs/023 b/tests/xfs/023
index 120be64e432db04d3b346e08bfae94cf3f114a53..9a899a86268d24b9f0d80073da6504205412f1ca 100755 (executable)
--- a/tests/xfs/023
+++ b/tests/xfs/023
@@ -38,7 +38,7 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/dump
 
 # link correct .out file
-_link_out_file $seq.out $seqfull.out
+_link_out_file
 
 # real QA test starts here
 _supported_fs xfs

diff --git a/tests/xfs/023.cfg b/tests/xfs/023.cfg
new file mode 100644 (file)
index 0000000..7ffdfc0
--- /dev/null
+++ b/tests/xfs/023.cfg
@@ -0,0 +1,2 @@
+irix: irix
+linux: linux

diff --git a/tests/xfs/030 b/tests/xfs/030
index a43455f595ba3bb4eebac5b606cf7fa21a9b9362..d2f5ed1917db0a64550e23bf6464fa71e55b53e8 100755 (executable)
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -46,7 +46,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common/repair
 
 # link correct .out file
-_link_out_file $seq.out $seqfull.out
+_link_out_file
 
 # nuke the superblock, AGI, AGF, AGFL; then try repair the damage
 #

diff --git a/tests/xfs/030.cfg b/tests/xfs/030.cfg
new file mode 100644 (file)
index 0000000..7ffdfc0
--- /dev/null
+++ b/tests/xfs/030.cfg
@@ -0,0 +1,2 @@
+irix: irix
+linux: linux

diff --git a/tests/xfs/031 b/tests/xfs/031
index 48a97e1d5f4fe0fbec6601a81f9d8c79a290c0c1..59d68c31f9a13cecce669a8bb24de91880cffc98 100755 (executable)
--- a/tests/xfs/031
+++ b/tests/xfs/031
@@ -39,7 +39,7 @@ rm -f $seqres.full
 . ./common/filter
 
 # link correct .out file
-_link_out_file $seq.out $seqfull.out
+_link_out_file
 
 _check_repair()
 {

diff --git a/tests/xfs/031.cfg b/tests/xfs/031.cfg
new file mode 100644 (file)
index 0000000..7ffdfc0
--- /dev/null
+++ b/tests/xfs/031.cfg
@@ -0,0 +1,2 @@
+irix: irix
+linux: linux

diff --git a/tests/xfs/033 b/tests/xfs/033
index 576d437e33ff78ba17c3238417832d95628946cc..dab111aa00f49eafa50029bfc3451b07acffae7a 100755 (executable)
--- a/tests/xfs/033
+++ b/tests/xfs/033
@@ -84,11 +84,11 @@ _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
        _scratch_mkfs_xfs -isize=512 | _filter_mkfs >/dev/null 2>&1
 
 # link correct .out file
+FEATURES=$(_get_os_name)
 if [ $_fs_has_crcs -eq 1 ]; then
-       _link_out_file $seq.crc.out $seqfull.out
-else
-       _link_out_file $seq.out $seqfull.out
+       FEATURES=$FEATURES,crc
 fi
+_link_out_file_named $seqfull.out "$FEATURES"
 
 `xfs_db -r -c sb -c p $SCRATCH_DEV | grep 'ino = ' | \
        sed -e 's/ //g' -e 's/^/export /'`

diff --git a/tests/xfs/033.cfg b/tests/xfs/033.cfg
new file mode 100644 (file)
index 0000000..88e90e5
--- /dev/null
+++ b/tests/xfs/033.cfg
@@ -0,0 +1,3 @@
+irix: irix
+linux,crc: crc.linux
+linux: linux

diff --git a/tests/xfs/033.crc.out.linux b/tests/xfs/033.out.crc.linux
similarity index 100%
rename from tests/xfs/033.crc.out.linux
rename to tests/xfs/033.out.crc.linux

diff --git a/tests/xfs/035 b/tests/xfs/035
index 70eac93eff29b16c9633aead1a8efe71a49865b3..25f2f6972f9ad0cf7089dd2ed99fc49311cd7376 100755 (executable)
--- a/tests/xfs/035
+++ b/tests/xfs/035
@@ -37,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/dump
 
 # link correct .out file
-_link_out_file $seq.out $seqfull.out
+_link_out_file
 
 # real QA test starts here
 _supported_fs xfs

diff --git a/tests/xfs/035.cfg b/tests/xfs/035.cfg
new file mode 100644 (file)
index 0000000..7ffdfc0
--- /dev/null
+++ b/tests/xfs/035.cfg
@@ -0,0 +1,2 @@
+irix: irix
+linux: linux

diff --git a/tests/xfs/036 b/tests/xfs/036
index 32b8c87c175f66d883e21099d7330862469eb5db..280d03665ba9dd6b8a7f6ae126677687cd9950ff 100755 (executable)
--- a/tests/xfs/036
+++ b/tests/xfs/036
@@ -37,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/dump
 
 # link correct .out file
-_link_out_file $seq.out $seqfull.out
+_link_out_file
 
 # real QA test starts here
 _supported_fs xfs

diff --git a/tests/xfs/036.cfg b/tests/xfs/036.cfg
new file mode 100644 (file)
index 0000000..7ffdfc0
--- /dev/null
+++ b/tests/xfs/036.cfg
@@ -0,0 +1,2 @@
+irix: irix
+linux: linux

diff --git a/tests/xfs/039 b/tests/xfs/039
index 974792300e8b7f2b1435624a51ad9cd531b12a11..2f765b825b9ddec4480aaa3acfd7f5fc89af3ca8 100755 (executable)
--- a/tests/xfs/039
+++ b/tests/xfs/039
@@ -37,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/dump
 
 # link correct .out file
-_link_out_file $seq.out $seqfull.out
+_link_out_file
 
 # real QA test starts here
 _supported_fs xfs

diff --git a/tests/xfs/039.cfg b/tests/xfs/039.cfg
new file mode 100644 (file)
index 0000000..7ffdfc0
--- /dev/null
+++ b/tests/xfs/039.cfg
@@ -0,0 +1,2 @@
+irix: irix
+linux: linux

diff --git a/tests/xfs/043 b/tests/xfs/043
index 55a52257a7d8ee642046b66dd33e4758ed84a99b..59eeff6e77771784c4f228313010bf880936de96 100755 (executable)
--- a/tests/xfs/043
+++ b/tests/xfs/043
@@ -39,7 +39,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/dump
 
 # link correct .out file
-_link_out_file $seq.out $seqfull.out
+_link_out_file
 
 # real QA test starts here
 _supported_fs xfs

diff --git a/tests/xfs/043.cfg b/tests/xfs/043.cfg
new file mode 100644 (file)
index 0000000..7ffdfc0
--- /dev/null
+++ b/tests/xfs/043.cfg
@@ -0,0 +1,2 @@
+irix: irix
+linux: linux

diff --git a/tests/xfs/055 b/tests/xfs/055
index cc747d3018a15297cee5811e91b6cbdd7772c9fe..920ba2886cc0d440a039cd61a86236e73dd0250a 100755 (executable)
--- a/tests/xfs/055
+++ b/tests/xfs/055
@@ -37,7 +37,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common/dump
 
 # link correct .out file
-_link_out_file $seq.out $seqfull.out
+_link_out_file
 
 # real QA test starts here
 _supported_fs xfs

diff --git a/tests/xfs/082 b/tests/xfs/082
index fff1d6b48dc2d58c157265d52c9b5bd03eda1f0b..f1178fdc9311b7cf95271e6b806b9ae0d53979ec 100755 (executable)
--- a/tests/xfs/082
+++ b/tests/xfs/082
@@ -55,7 +55,7 @@ _require_scratch
 _require_v2log 
 
 # link correct .out file
-_link_out_file $seq.op $seqfull.op
+_link_out_file_named $seqfull.op $(_get_os_name)
 
 echo "*** init FS"
 umount $SCRATCH_DEV >/dev/null 2>&1

diff --git a/tests/xfs/082.cfg b/tests/xfs/082.cfg
new file mode 100644 (file)
index 0000000..7ffdfc0
--- /dev/null
+++ b/tests/xfs/082.cfg
@@ -0,0 +1,2 @@
+irix: irix
+linux: linux

diff --git a/tests/xfs/146 b/tests/xfs/146
index c6343f86f73a0d89bb5be3913aaa3269975233fb..f6cd3f30215a401d87dd02e5dfe4c1bbd6128d72 100755 (executable)
--- a/tests/xfs/146
+++ b/tests/xfs/146
@@ -48,7 +48,7 @@ _supported_fs xfs
 _supported_os Linux IRIX
 
 # link correct .out file
-_link_out_file $seq.out $seqfull.out
+_link_out_file
 
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1

diff --git a/tests/xfs/146.cfg b/tests/xfs/146.cfg
new file mode 100644 (file)
index 0000000..7ffdfc0
--- /dev/null
+++ b/tests/xfs/146.cfg
@@ -0,0 +1,2 @@
+irix: irix
+linux: linux