drop truncate capa after ll_truncate.

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

diff --git a/lustre/tests/runtests b/lustre/tests/runtests
index 6a8aac8..05914d7 100755 (executable)
--- a/lustre/tests/runtests
+++ b/lustre/tests/runtests
@@ -22,29 +22,30 @@ ERROR=
 SRC=/etc
 [ "$COUNT" ] || COUNT=1000
 
-[ "$LCONF" ] || LCONF=$SRCDIR/../utils/lconf
+[ "$LCONF" ] || LCONF=lconf
 
-[ "$MCREATE" ] || MCREATE=$SRCDIR/../tests/mcreate
+[ "$MCREATE" ] || MCREATE=mcreate
 
 [ "$MKDIRMANY" ] || MKDIRMANY=$SRCDIR/../tests/mkdirmany
 
 while [ "$1" ]; do
        case $1 in
        *.xml) export NAME=`echo $1 | sed "s/.xml//"` ;;
+       *) OPTS="$OPTS $1" ;;
        esac
        shift
 done
 
-MOUNT="`mount | awk '/ lustre_lite / { print $3 }' | tail -1`"
+MOUNT="`mount | awk '/ lustre_lite / { print $3 }' | tail -n 1`"
 if [ -z "$MOUNT" ]; then
-       sh llmount.sh
-       MOUNT="`mount | awk '/ lustre_lite / { print $3 }' | tail -1`"
+       sh llmount.sh $OPTS
+       MOUNT="`mount | awk '/ lustre_lite / { print $3 }' | tail -n 1`"
        [ -z "$MOUNT" ] && fail "no lustre filesystem mounted" 1
        I_MOUNTED="yes"
 fi
 
 OSCTMP=`echo $MOUNT | tr "/" "."`
-USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1`
+USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -n 1`
 USED=`expr $USED + 16` # Some space for the status file
 
 # let's start slowly here...
@@ -77,7 +78,7 @@ mkdir $DST || fail "can't mkdir $DST" 10
 
 # 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`
+FILES=`find $SRC -type f -mtime +1 -ctime +1 | head -n $COUNT`
 log "copying files from $SRC to $DST$SRC"
 tar cf - $FILES | tar xvf - -C $DST || fail "copying $SRC" 11
 
@@ -90,7 +91,7 @@ done
 [ "$ERROR" ] && fail "old and new files are different" $ERROR
 
 sh llmountcleanup.sh || exit 19
-sh llrmount.sh || exit 20
+sh llrmount.sh $OPTS || exit 20
 
 log "comparing previously copied files"
 for f in $FILES; do
@@ -116,14 +117,14 @@ if [ $COUNT -gt 10 -o $COUNT -eq 0 ]; then
 fi
 
 # mkdirmany test (bug 589)
-log "running mkdirmany $MOUNT/base$$ 100"
+log "running $MKDIRMANY $MOUNT/base$$ 100"
 $MKDIRMANY $MOUNT/base$$ 100 || fail "mkdirmany failed"
 log "removing mkdirmany directories"
 rmdir $MOUNT/base$$* || fail "mkdirmany cleanup failed"
 
 log "done"
 
-NOWUSED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1`
+NOWUSED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -n 1`
 if [ `expr $NOWUSED - $USED` -gt 1024 ]; then
        echo "Space not all freed: now ${NOWUSED}kB, was ${USED}kB." 1>&2
 fi