xfstests: A few updates to non-test code

Make in the toplevel directory tries to process the 'group' file that existed in the previous file layout

$ make
 sed: can't read group: No such file or directory
 sed: can't read group: No such file or directory
 ...

Signed-off-by David Sterba <[email protected]>

The initial value of FSTYP is unconditionally set to 'xfs' and the filesystem type is taken from the TEST_DEV. This could lead to confusion if the device hasn't been formatted yet, eg. an empty image in VM, or a different test setup took place before.

Now one can specify the desired FSTYP in advance and be safe. If unset, the fallback to TEST_DEV type continues to work.

Signed-off-by David Sterba <[email protected]>

---
 README | 3 +++
 check  | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

README +3 -0

index a49ca7c3ff15..62974ef87b89 100644
@@ -65,6 +65,9 @@ Preparing system for tests (IRIX and Linux):
                environment variable set to "yes" will enable their use.
              - setenv DIFF_LENGTH "number of diff lines to print from a failed test",
                by default 10, set to 0 to print the full diff
+             - setenv FSTYP "the filesystem you want to test", the filesystem
+               type is devised from the TEST_DEV device, but you may want to
+               override it
         - or add a case to the switch in common/config assigning
           these variables based on the hostname of your test
           machine

check +0 -0

index 320ad26b7c2c..9e4275b1fa37 100755

check showme=false · line 36

Quoted 8 lines · David Sterba

check +1 -1

@@ -33,7 +33,7 @@ showme=false
 have_test_arg=false
 randomize=false
 here=`pwd`
-FSTYP=xfs
+FSTYP=${FSTYP:-xfs}

":-xfs" means assign the value of $xfs if $FTYPE is null. xfs is not a variable....

check then · line 62

Quoted 5 lines

check +3 -2

-# Autodetect fs type based on what's on $TEST_DEV
-if [ "$HOSTOS" == "Linux" ]; then
+# Autodetect fs type based on what's on $TEST_DEV unless it's been set
+# externally
+if [ -z "$FSTYP" -a "$HOSTOS" == "Linux" ]; then

If the default value expansion is fixed, FSTYP will always have a value here Hence it will never, ever probe.

Quoted 3 lines

FSTYP=blkid -c /dev/null -s TYPE -o value $TEST_DEV
fi
export FSTYP

I suspect what you want is:

-FSTYP=xfs

.....

if [ -z "$FSTYP" -a "$HOSTOS" == "Linux" ]; then
FSTYP=blkid -c /dev/null -s TYPE -o value $TEST_DEV
fi
FSTYP=${FSTYP:=xfs}
export FSTYP

Quoted 12 lines · Dave Chinner

check showme=false · line 36

Quoted 8 lines · David Sterba

check +1 -1

@@ -33,7 +33,7 @@ showme=false
 have_test_arg=false
 randomize=false
 here=`pwd`
-FSTYP=xfs
+FSTYP=${FSTYP:-xfs}

":-xfs" means assign the value of $xfs if $FTYPE is null. xfs is not a variable....

Docs say that

${parameter:-word}
If parameter is unset or null, the expansion of word is substituted. Otherwise, the value of parameter is substituted.

so 'xfs' will expand to itself. And I did test this one with:

$ cat default.sh << EOF
FSTYP=${FSTYP:-xfs}
echo $FSTYP
EOF

$ cat external.sh << EOF
FSTYP=btrfs
source default.sh
EOF

$ sh default.sh
xfs

$ sh external.sh
btrfs

Quoted 17 lines

check then · line 62

Quoted 5 lines

check +3 -2

-# Autodetect fs type based on what's on $TEST_DEV
-if [ "$HOSTOS" == "Linux" ]; then
+# Autodetect fs type based on what's on $TEST_DEV unless it's been set
+# externally
+if [ -z "$FSTYP" -a "$HOSTOS" == "Linux" ]; then

If the default value expansion is fixed, FSTYP will always have a value here Hence it will never, ever probe.

Quoted 3 lines

FSTYP=blkid -c /dev/null -s TYPE -o value $TEST_DEV
fi
export FSTYP

I suspect what you want is:

-FSTYP=xfs

Quoted 7 lines

.....

if [ -z "$FSTYP" -a "$HOSTOS" == "Linux" ]; then
FSTYP=blkid -c /dev/null -s TYPE -o value $TEST_DEV
fi
FSTYP=${FSTYP:=xfs}
export FSTYP

Right, the default assignment has to be last. I'll use the := form to be consistent with what's used in the file, though :- works here as well, just does not assign the variable within the ${...} expression. The result is the same.

If DIFF_LENGTH is set to 0, the full output is available and the message does not make sense.

Signed-off-by David Sterba <[email protected]>

---
 check | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

check +0 -0

index 9e4275b1fa37..d578e49b78d4 100755

Minor bugfixes or enhancements.

David Sterba (5):
xfstests: fix minor build warning
xfstests: use value of FSTYP if defined externally
xfstests: don't suggest to run full diff when DIFF_LENGTH is 0
xfstests: accept tests/ prefix for test name on commandline
xfstests: update lsqa.pl for new tests layout