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

diff --git a/common.config b/common.config
index 237465ba429f2b7555105bf01da4747bdb83bb6b..71001a4ba3dcd32067b3f8cddcbeb45a4a6bb576 100644 (file)
--- 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 21da5d4dc304cead2248d9334c5ab82b9533cd09..01b64bad78dab750be22273f5533da8cafa4b6c3 100755 (executable)
--- 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 ""