X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fruntests;h=8080e311d096d2a507b17e101eadaabc86c80583;hb=f940ffad2bc61bc1f7f14340f4142d14f9712c65;hp=42bc0870254d901b1d20ea9e7ae3deea7f22ae9f;hpb=d2d56f38da01001c92a09afc6b52b5acbd9bc13c;p=fs%2Flustre-release.git

diff --git a/lustre/tests/runtests b/lustre/tests/runtests
index 42bc087..8080e31 100755
--- a/lustre/tests/runtests
+++ b/lustre/tests/runtests
@@ -24,15 +24,10 @@ fail() {
 	exit $RC
 }
 
-log() {
-	echo "$*"
-	lctl mark "$*"
-}
-
-
 ERROR=
-SRC=/etc
+RUNTESTS_SRC=${RUNTESTS_SRC:-"/etc /bin"}
 [ "$COUNT" ] || COUNT=1000
+[ "$SLOW" = "no" ] && COUNT=100
 
 [ "$MCREATE" ] || MCREATE=mcreate
 
@@ -46,11 +41,7 @@ while [ "$1" ]; do
 	shift
 done
 
-mounted_lustre_filesystems() {
-	awk '($3 ~ "lustre" && $1 ~ ":") { print $2 }' /proc/mounts
-}
-
-MOUNTED="`mounted_lustre_filesystems`"
+MOUNTED=$(mounted_lustre_filesystems | head -1)
 if [ -z "$MOUNTED" ]; then
 	formatall
 	setupall
@@ -100,9 +91,11 @@ 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 -n $COUNT`
-log "copying files from $SRC to $DST$SRC at `date`"
-tar cf - $FILES | tar xvf - -C $DST > /dev/null || fail "copying $SRC" 11
+FILES=`find $RUNTESTS_SRC -type f -mtime +1 | head -n $COUNT`
+[ -z "$FILES" ] && fail "No unchanged files - is $RUNTESTS_SRC a new dir?"
+
+log "copying files from $RUNTESTS_SRC to $DST$RUNTESTS_SRC at `date`"
+tar cf - $FILES | tar xvf - -C $DST > /dev/null || fail "copying $RUNTESTS_SRC" 11
 
 log "comparing newly copied files at `date`"
 for f in $FILES; do