[Top] [All Lists]

[PATCH 2/5] xfstests: use value of FSTYP if defined externally

To: xfs@xxxxxxxxxxx
Subject: [PATCH 2/5] xfstests: use value of FSTYP if defined externally
From: David Sterba <dsterba@xxxxxxx>
Date: Thu, 16 Jan 2014 18:07:12 +0100
Cc: David Sterba <dsterba@xxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <cover.1389891730.git.dsterba@xxxxxxx>
In-reply-to: <cover.1389891730.git.dsterba@xxxxxxx>
References: <cover.1389891730.git.dsterba@xxxxxxx>
References: <cover.1389891730.git.dsterba@xxxxxxx>
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 <dsterba@xxxxxxx>
 README | 3 +++
 check  | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README b/README
index a49ca7c3ff15..62974ef87b89 100644
--- a/README
+++ b/README
@@ -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 
                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
diff --git a/check b/check
index 320ad26b7c2c..9e4275b1fa37 100755
--- a/check
+++ b/check
@@ -33,7 +33,7 @@ showme=false
 # start the initialisation work now
@@ -57,8 +57,9 @@ then
     exit 1
-# 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
     FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
 export FSTYP

<Prev in Thread] Current Thread [Next in Thread>