LU-1538 tests: cleanup test output, acc-small

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

diff --git a/lustre/tests/runtests b/lustre/tests/runtests
index 122a006..f4297ff 100755 (executable)
--- a/lustre/tests/runtests
+++ b/lustre/tests/runtests
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Script which does some basic tests to ensure we haven't regressed.
 # Probably a good idea to run this before doing any checkins.
@@ -13,38 +13,17 @@ export NAME=${NAME:-local}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_logging
 
-SETUP=${SETUP:-setupall}
-FORMAT=${FORMAT:-formatall}
-CLEANUP=${CLEANUP:-stopall}
-
-ERROR=
 RUNTESTS_SRC=${RUNTESTS_SRC:-"/etc /bin"}
-[ "$COUNT" ] || COUNT=1000
-[ "$SLOW" = "no" ] && COUNT=100
+[ "$COUNT" ] || COUNT=10000
+[ "$SLOW" = "no" ] && COUNT=1000
 
 [ "$MCREATE" ] || MCREATE=mcreate
 
 [ "$MKDIRMANY" ] || MKDIRMANY="createmany -d"
 
-while [ "$1" ]; do
-       case $1 in
-       *.xml) export NAME=`echo $1 | sed "s/.xml//"` ;;
-       *) OPTS="$OPTS $1" ;;
-       esac
-       shift
-done
-
-MOUNTED=$(mounted_lustre_filesystems | head -1)
-if [ -z "$MOUNTED" ]; then
-       formatall
-       setupall
-       MOUNTED="`mounted_lustre_filesystems`"
-       [ -z "$MOUNTED" ] && error "NAME=$NAME not mounted"
-       I_MOUNTED=yes
-fi
-
-MOUNT=$MOUNTED
+check_and_setup_lustre
 
 OSCTMP=`echo $MOUNT | tr "/" "."`
 USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -n 1`
@@ -75,7 +54,7 @@ if [ $COUNT -gt 10 -o $COUNT -eq 0 ]; then
        rm $HOSTS || error "can't remove $HOSTS" 9
        cp /etc/hosts $HOSTS.2 || error "can't cp /etc/hosts to $HOSTS.2" 7
        log "truncating $HOSTS.2 to $TRUNCSIZE bytes"
-       truncate $HOSTS.2 $TRUNCSIZE
+       $TRUNCATE $HOSTS.2 $TRUNCSIZE
 fi
 
 DST=$MOUNT/runtest.$$
@@ -85,34 +64,39 @@ mkdir $DST || error "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 $RUNTESTS_SRC -type f -mtime +1 | head -n $COUNT`
-[ -z "$FILES" ] && error "No unchanged files - is $RUNTESTS_SRC a new dir?"
+FILES=$TMP/runtests.files
+# use "NUL" instead of newline as filename terminator, bug 19702 
+find $RUNTESTS_SRC -type f -mtime +1 | head -n $COUNT | tr '\n' '\0' > $FILES
+[ -s "$FILES" ] ||
+       error "$RUNTESTS_SRC contains only files modifed less than 2 days ago"
+COUNT=$(xargs -0 -n 1 echo < $FILES | wc -l)
+
+log "copying $COUNT files from $RUNTESTS_SRC to $DST$RUNTESTS_SRC at `date`"
+tar cf - --null --files-from $FILES | tar xvf - -C $DST > /dev/null ||
+       error "copying $RUNTESTS_SRC" 11
 
-log "copying files from $RUNTESTS_SRC to $DST$RUNTESTS_SRC at `date`"
-tar cf - $FILES | tar xvf - -C $DST > /dev/null || error "copying $RUNTESTS_SRC" 11
+log "comparing $COUNT newly copied files at `date`"
 
-log "comparing newly copied files at `date`"
-for f in $FILES; do
+cat $FILES | tr "\0" "\n" | ( rc=0; while read f; do
        [ $V ] && log "verifying $DST/$f"
-       diff -q $f $DST/$f || ERROR=11
+       diff -q "$f" "$DST/$f" || rc=11
 done
+[ "$rc" = 0 ] || error_exit "old and new files are different: rc=$rc" ) 
 
-[ "$ERROR" ] && error "old and new files are different" $ERROR
 log "finished at `date` ($(($(date +%s) - START)))"
 
-$CLEANUP || exit 19
-$SETUP || exit 20
+stopall || exit 19
+setupall || exit 20
 
-log "comparing previously copied files"
-for f in $FILES; do
+log "comparing $COUNT previously copied files"
+cat $FILES | tr "\0" "\n" | ( rc=0; while read f; do
        [ $V ] && log "verifying $DST/$f"
-       diff -q $f $DST/$f || ERROR=22
+       diff -q "$f" "$DST/$f" || rc=22
 done
+[ "$rc" = 0 ] || error_exit "old and new files are different: rc=$rc" )
 
-[ "$ERROR" ] && error "old and new files are different on second diff" $ERROR
-
-$CLEANUP || exit 19
-$SETUP || exit 20
+stopall || exit 21
+setupall || exit 22
 
 log "removing $DST"
 rm -r $V $DST || error "can't remove $DST" 37
@@ -133,7 +117,7 @@ fi
 # mkdirmany test (bug 589)
 log "running $MKDIRMANY $MOUNT/base$$ 100"
 $MKDIRMANY $MOUNT/base$$ 100 || error "mkdirmany failed"
-log "removing mkdirmany directories"
+log "removing $MKDIRMANY directories"
 rmdir $MOUNT/base$$* || error "mkdirmany cleanup failed"
 
 log "done"
@@ -143,6 +127,7 @@ if [ `expr $NOWUSED - $USED` -gt 1024 ]; then
        echo "Space not all freed: now ${NOWUSED}kB, was ${USED}kB." 1>&2
 fi
 
-if [ "$I_MOUNTED" = "yes" ]; then
-       $CLEANUP
-fi
+complete $(basename $0) $SECONDS
+rm -f $FILES
+check_and_cleanup_lustre
+exit_status