X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fruntests;h=05914d7f6723e6a9a4ac2bb6b8a5bba15dd7ed33;hb=031a68539c69c90d522758cb5d382a0c0e86188a;hp=d97bdeac330711dcddff1d9b1a81624788e0dcfd;hpb=cbd3a230274e1197d378725ee9e2aed6e35d2cb6;p=fs%2Flustre-release.git

diff --git a/lustre/tests/runtests b/lustre/tests/runtests
index d97bdea..05914d7 100755
--- a/lustre/tests/runtests
+++ b/lustre/tests/runtests
@@ -22,22 +22,23 @@ 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 -n 1`"
 if [ -z "$MOUNT" ]; then
-	sh llmount.sh
+	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"
@@ -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,7 +117,7 @@ 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"