# configuration (you could tune this)
EXTRA="-xfs-qa"
-VERSION="2.4.0"
+VERSION="2.4.4"
BOOT="/boot"
SOAK_PASSES="-1"
SOAK_STRESS="10000"
ROOT="$HOME/qa"
HOST=`hostname -s`
-if [ ! -z "CVSROOT" ]; then
- CVS=true
+if [ ! -z "$CVSROOT" ]; then
WORKAREA="$ROOT/linux-2.4-xfs"
+else
+ [ -z "$WORKAREA" ] && WORKAREA="$ROOT/linux-xfs"
fi
-[ -z "$WORKAREA" ] && WORKAREA="$ROOT/linux-xfs"
export WORKAREA
export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin/ptools:/usr/local/bin"
SUDO="su -c"
IMAGE="$BOOT/vmlinuz-$VERSION$EXTRA"
SYSTEMMAP="$BOOT/System.map-$VERSION$EXTRA"
-CONFIG="$ROOT/$HOST-$VERSION$EXTRA.config"
+CONFIG="$ROOT/$HOST.config"
MODULES="/lib/modules/$VERSION$EXTRA"
COMMON_CONFIG="$WORKAREA/cmd/xfstests/common.config"
SH="/bin/sh"
_restart()
{
- exec $ROOT/su -c "shutdown -r 2 \"auto-qa rebooting\" &" < /dev/null
+ # erk - why won't this thing reboot reliably??
+ exec $ROOT/su -c "(shutdown -r 2 \"auto-qa rebooting\" ; sleep 10 ; reboot ; sleep 10 ; reboot )&" < /dev/null
}
_update_autoqa_file()
{
SELF="$ROOT/auto-qa"
SELF_UPDATE="cmd/xfstests/tools/auto-qa"
- if [ $CVS = false ]; then
+ if [ -z "$CVSROOT" ]; then
cmd="p_tupdate $SELF_UPDATE"
else
cmd="cvs -z3 update $SELF_UPDATE"
fi
- exec $SH -c "cd $WORKAREA ; eval $cmd; chmod +x $SELF_UPDATE ; exec $SELF"
+ exec $SH -c "cd $WORKAREA ; $cmd; chmod +x $SELF_UPDATE ; exec $SELF"
}
_update_workarea()
{
- if [ $CVS = false ]; then
+ if [ -z "$CVSROOT" ]; then
_log " *** p_tupdate"
cd $WORKAREA
p_tupdate 2>&1 \
|| _fail " !!! clean $pkg failed"
done
- _log " *** clean quota tools"
- cd $WORKAREA/cmd/quota
- ( rm -f configure ; autoconf ; sh configure ; make clean ) 2>&1 \
- || _fail " !!! clean quota failed"
-
_log " *** clean linux"
cd $WORKAREA/linux
make mrproper 2>&1 \
|| _fail " !!! install $pkg failed"
done
- _log " *** build and install quota tools"
- cd $WORKAREA/cmd/quota
-
- # use e-fence - but this will only take effect on configure
- export MALLOCLIB=/usr/lib/libefence.a
- ( rm -f configure ; autoconf ; sh configure ; make all ) 2>&1 \
- || _fail " !!! build quota failed"
- _sudo make install 2>&1 \
- || _fail " !!! install quota failed"
-
new_state="install"
;;
_log " *** kernel modules"
ls -l /lib/modules/$VERSION$EXTRA/kernel/fs/pagebuf/* \
/lib/modules/$VERSION$EXTRA/kernel/fs/xfs/* \
- /lib/modules/$VERSION$EXTRA/kernel/fs/xfs/support/*
+ /lib/modules/$VERSION$EXTRA/kernel/fs/xfs_support/*
if [ $MODULAR -eq 0 ]
then