From: fsgqa <fsgqa>
Date: Wed, 14 May 2003 23:34:32 +0000 (+0000)
Subject: Fix shell botch in recent configuration update to XFS auto-qa.
X-Git-Tag: v1.1.0~996
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=16f3cf713f97a161eb96bba540db826cc43e4509;p=users%2Fhch%2Fxfstests-dev.git

Fix shell botch in recent configuration update to XFS auto-qa.
---

diff --git a/common.config b/common.config
index 237465ba4..71001a4ba 100644
--- a/common.config
+++ b/common.config
@@ -71,7 +71,7 @@ SOAK_PASSES=-1		# count of repetitions of fsstress (while soaking)
 EMAIL=root@localhost	# where auto-qa will send its status messages
 export MKFS_OPTIONS=${MKFS_OPTIONS:=-bsize=4096}
 export MOUNT_OPTIONS=${MOUNT_OPTIONS:=-ologbufs=2}
-export CHECK_OPTIONS=${CHECK_OPTIONS:=-gauto}
+export CHECK_OPTIONS=${CHECK_OPTIONS:="-g auto"}
 export BENCH_PASSES=${BENCH_PASSES:=5}
 
 export DEBUG=${DEBUG:=-DEXPERIMENTAL_LARGE_SECTORS}
diff --git a/tools/auto-qa b/tools/auto-qa
index 21da5d4dc..01b64bad7 100755
--- a/tools/auto-qa
+++ b/tools/auto-qa
@@ -410,12 +410,11 @@ do
 	*check)
 	    uname=`uname -ar`
 	    _log "	    *** uname $uname"
-	    _log "	    *** user tools"
-	    ls -l /sbin/*xfs* /usr/sbin/*xfs* 2>&1
 	    _log "	    *** kernel"
 	    ls -l /boot/*$EXTRA*  2>&1
 	    _log "	    *** kernel modules"
-	    ls -l /lib/modules/$SVERSION$EXTRA/kernel/fs/xfs/*
+	    [ -d /lib/modules/$SVERSION$EXTRA/kernel/fs/xfs ] && \
+		ls -l /lib/modules/$SVERSION$EXTRA/kernel/fs/xfs/*
 
 	    if [ "$MODULAR" -eq 0 ]
 	    then
@@ -502,7 +501,7 @@ do
 	*run)
 	    cd $QADIR
 	    
-	    _log "	    *** run tests"
+	    _log "	    *** run tests ($CHECK_OPTIONS)"
 	    _sudo ./check -l $CHECK_OPTIONS 2>&1 | tee $ROOT/qa.out
 	    
 	    _log ""