xfs
[Top] [All Lists]

[PATCH] xfstests: check: set up config variables before using them

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfstests: check: set up config variables before using them
From: David Sterba <dsterba@xxxxxxx>
Date: Thu, 28 Mar 2013 18:00:18 +0100
Cc: David Sterba <dsterba@xxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
HOSTOS was used in a test before being initialized and this led to
failed filesystem type detection.

Signed-off-by: David Sterba <dsterba@xxxxxxx>
---

Sidenote, FSTYP has been exported properly, I've accidentally deleted it during
debugging. The patch "xfstests: remove unconditional setting of FSTYP" is now
obsolete.

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

diff --git a/check b/check
index 18cae75..3b48402 100755
--- a/check
+++ b/check
@@ -50,12 +50,6 @@ timestamp=${TIMESTAMP:=false}
 
 rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out $tmp.xlist
 
-# Autodetect fs type based on what's on $TEST_DEV
-if [ "$HOSTOS" == "Linux" ]; then
-    FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
-fi
-export FSTYP
-
 # we need common.config
 if ! . ./common/config
 then
@@ -63,6 +57,12 @@ then
     exit 1
 fi
 
+# Autodetect fs type based on what's on $TEST_DEV
+if [ "$HOSTOS" == "Linux" ]; then
+    FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
+fi
+export FSTYP
+
 SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
 SRC_GROUPS="generic shared"
 export SRC_DIR="tests"
-- 
1.8.2

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