land b_md onto HEAD:

[fs/lustre-release.git] / lustre / tests / runtests

diff --git a/lustre/tests/runtests b/lustre/tests/runtests
index 54cc5da..e068a01 100755 (executable)
--- a/lustre/tests/runtests
+++ b/lustre/tests/runtests
@@ -5,23 +5,50 @@
 # In the future this can become more fancy, but it's OK for now.
 
 SRCDIR="`dirname $0`"
+fail() { 
+       echo "ERROR: $1" 1>&2
+       [ $2 ] && RC=$2 || RC=1
+       exit $RC
+}
 
 export PATH=/sbin:/usr/sbin:$SRCDIR:$PATH
 
-. $SRCDIR/common.sh
-
 ERROR=
 SRC=/etc
 [ "$COUNT" ] || COUNT=1000
 
-setup_opts $@
+[ "$LCONF" ] || LCONF=$SRCDIR/../utils/lconf
+
+[ "$MCREATE" ] || MCREATE=$SRCDIR/../tests/mcreate
+
+while [ "$1" ]; do
+       case $1 in
+       *.xml) export NAME=`echo $1 | sed "s/.xml//"` ;;
+       esac
+       shift
+done
+
+OSCMT="`mount | awk '/ lustre_lite / { print $3 }' | tail -1`"
+if [ -z "$OSCMT" ]; then
+       sh llmount.sh
+       OSCMT="`mount | awk '/ lustre_lite / { print $3 }' | tail -1`"
+       [ -z "$OSCMT" ] && fail "no lustre filesystem mounted" 1
+       I_MOUNTED="yes"
+fi
 
-[ "`mount | grep $OSCMT`" ] || echo | sh llsetup.sh $@ || exit 1
+OSCTMP=`echo $OSCMT | tr "/" "."`
+USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1`
+USED=`expr $USED + 16` # Some space for the status file
 
 # let's start slowly here...
 echo "touching $OSCMT"
 touch $OSCMT || fail "can't touch $OSCMT" 2
 HOSTS=$OSCMT/hosts.$$
+
+# this will cause the following cp to trigger bug #620096
+echo "create an empty file $HOSTS"
+$MCREATE $HOSTS
+
 echo "copying /etc/hosts to $HOSTS"
 cp /etc/hosts $HOSTS || fail "can't cp /etc/hosts to $HOSTS" 3
 echo "comparing /etc/hosts and $HOSTS"
@@ -40,30 +67,33 @@ DST=$OSCMT/runtest.$$
 echo "creating $DST"
 mkdir $DST || fail "can't mkdir $DST" 10
 
-# ok, that hopefully worked, so let's do a little more
-FILES=`find $SRC -type f | head -$COUNT`
+# ok, that hopefully worked, so let's do a little more, with files that
+# haven't changed in the last day (hopefully they don't change during test)
+FILES=`find $SRC -type f -mtime +1 -ctime +1 | head -$COUNT`
 echo "copying files from $SRC to $DST$SRC"
 tar cf - $FILES | tar xvf - -C $DST || fail "copying $SRC" 11
 
 echo "comparing newly copied files"
 for f in $FILES; do
+       [ $V ] && echo "verifying $DST/$f"
        diff -q $f $DST/$f || ERROR=11
 done
 
 [ "$ERROR" ] && fail "old and new files are different" $ERROR
 
-sh llcleanup.sh $@
+sh llmountcleanup.sh || exit 19
+sh llrmount.sh || exit 20
 
-echo | sh llrsetup.sh $@ || exit 20
 echo "comparing previously copied files"
 for f in $FILES; do
+       [ $V ] && echo "verifying $DST/$f"
        diff -q $f $DST/$f || ERROR=22
 done
 
 [ "$ERROR" ] && fail "old and new files are different on second diff" $ERROR
 
-sh llcleanup.sh $@
-echo | sh llrsetup.sh $@ || exit 31
+sh llmountcleanup.sh || exit 19
+sh llrmount.sh || exit 20
 
 echo "renaming $HOSTS.ren to $HOSTS"
 mv $HOSTS.ren $HOSTS || fail "can't rename $HOSTS.ren to $HOSTS" 32
@@ -72,6 +102,14 @@ echo "truncating $HOSTS"
 echo "removing $HOSTS"
 rm $HOSTS || fail "can't remove $HOSTS again" 36
 echo "removing $DST"
-rm -r $DST || fail "can't remove $DST" 37
+rm -r $V $DST || fail "can't remove $DST" 37
+
+NOWUSED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1`
+if [ $NOWUSED -gt $USED ]; then
+       echo "Space not all freed: now ${NOWUSED}kB, was ${USED}kB." 1>&2
+       echo "This is normal on BA OSTs, because of subdirectories." 1>&2
+fi
 
-sh llcleanup.sh $@
+if [ "$I_MOUNTED" = "yes" ]; then
+       sh llmountcleanup.sh || exit 29
+fi