From 47127ed0ae84feaa78cf71bf71b3a12b21261f0a Mon Sep 17 00:00:00 2001 From: adilger Date: Fri, 10 Feb 2006 22:16:53 +0000 Subject: [PATCH] Branch b_release_1_4_6 Properly set $tfile and $tdir to match that of test_framework.sh. Disable test 76 for 2.4 kernels because of ambiguity of counting lustre inodes. r=green --- lustre/tests/sanity.sh | 35 +++++++++++++-------- lustre/tests/sanityN.sh | 81 +++++++++++++++++++++++++++++++++---------------- 2 files changed, 78 insertions(+), 38 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 5bb9b78..035470a 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -14,14 +14,11 @@ ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"42a 42c 45 68"} [ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 24o 27m 51b 51c 64b 71 101" case `uname -r` in -2.4*) FSTYPE=${FSTYPE:-ext3} ;; -2.6*) FSTYPE=${FSTYPE:-ldiskfs}; ALWAYS_EXCEPT="$ALWAYS_EXCEPT 60 69";; +2.4*) FSTYPE=${FSTYPE:-ext3}; ALWAYS_EXCEPT="$ALWAYS_EXCEPT 76" ;; +2.6*) FSTYPE=${FSTYPE:-ldiskfs}; ALWAYS_EXCEPT="$ALWAYS_EXCEPT 60 69" ;; *) error "unsupported kernel" ;; esac -[ "$ALWAYS_EXCEPT$EXCEPT$SANITY_EXCEPT" ] && \ - echo "Skipping tests: `echo $ALWAYS_EXCEPT $EXCEPT $SANITY_EXCEPT`" - SRCDIR=`dirname $0` export PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH:/sbin @@ -107,16 +104,26 @@ check_kernel_version() { return 1 } +_basetest() { + echo $* +} + +basetest() { + IFS=abcdefghijklmnopqrstuvwxyz _basetest $1 +} + run_one() { if ! mount | grep -q $DIR; then $START fi + testnum=$1 + message=$2 BEFORE=`date +%s` - log "== test $1: $2= `date +%H:%M:%S` ($BEFORE)" - export TESTNAME=test_$1 + log "== test $testnum: $message= `date +%H:%M:%S` ($BEFORE)" + export TESTNAME=test_$testnum export tfile=f${testnum} export tdir=d${base} - test_$1 || error "exit with rc=$?" + test_${testnum} || error "exit with rc=$?" unset TESTNAME pass "($((`date +%s` - $BEFORE))s)" cd $SAVE_PWD @@ -124,6 +131,9 @@ run_one() { } build_test_filter() { + [ "$ALWAYS_EXCEPT$EXCEPT$SANITY_EXCEPT" ] && \ + echo "Skipping tests: `echo $ALWAYS_EXCEPT $EXCEPT $SANITY_EXCEPT`" + for O in $ONLY; do eval ONLY_${O}=true done @@ -141,7 +151,7 @@ basetest() { } run_test() { - base=`basetest $1` + export base=`basetest $1` if [ "$ONLY" ]; then testname=ONLY_$1 if [ ${!testname}x != x ]; then @@ -217,7 +227,7 @@ rm -rf $DIR/[Rdfs][1-9]* build_test_filter -echo preparing for tests involving mounts +echo "preparing for tests involving mounts" EXT2_DEV=${EXT2_DEV:-/tmp/SANITY.LOOP} touch $EXT2_DEV mke2fs -j -F $EXT2_DEV 8000 > /dev/null @@ -2556,7 +2566,7 @@ run_test 69 "verify oa2dentry return -ENOENT doesn't LBUG ======" test_71() { DBENCH_LIB=${DBENCH_LIB:-/usr/lib/dbench} - PATH=${PATH}:$DBENCH_LIB + PATH=${DBENCH_LIB}:${PATH} cp `which dbench` $DIR [ ! -f $DIR/dbench ] && echo "dbench not installed, skip this test" && return 0 @@ -2620,6 +2630,7 @@ test_75() { F128k=${F}_128k FHEAD=${F}_head FTAIL=${F}_tail + echo "using F=$F, F128k=$F128k, FHEAD=$FHEAD, FTAIL=$FTAIL" rm -f $F* dd if=/dev/urandom of=${F}_128k bs=1024 count=128 || error "dd failed" @@ -2675,7 +2686,7 @@ test_75() { $LFS getstripe ${F}_join_10 $OPENUNLINK ${F}_join_10 ${F}_join_10 || error "files unlink open" - rm -f $F* + rm -f $F* || true } run_test 75 "TEST join file" diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh index 2ea854a..a1df23a 100644 --- a/lustre/tests/sanityN.sh +++ b/lustre/tests/sanityN.sh @@ -7,9 +7,6 @@ ONLY=${ONLY:-"$*"} ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"14b 14c"} # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! -[ "$ALWAYS_EXCEPT$EXCEPT$SANITYN_EXCEPT" ] && \ - echo "Skipping tests: `echo $ALWAYS_EXCEPT $EXCEPT $SANITYN_EXCEPT`" - SRCDIR=`dirname $0` PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH @@ -67,38 +64,68 @@ run_one() { if ! mount | grep -q $DIR1; then $START fi + testnum=$1 + message=$2 BEFORE=`date +%s` - log "== test $1: $2= `date +%H:%M:%S` ($BEFORE)" - export TESTNAME=test_$1 + log "== test $testnum: $message= `date +%H:%M:%S` ($BEFORE)" + export TESTNAME=test_$testnum export tfile=f${testnum} export tdir=d${base} - test_$1 || error "test_$1: exit with rc=$?" + test_$1 || error "exit with rc=$?" unset TESTNAME pass "($((`date +%s` - $BEFORE))s)" cd $SAVE_PWD $CLEAN } +build_test_filter() { + [ "$ALWAYS_EXCEPT$EXCEPT$SANITYN_EXCEPT" ] && \ + echo "Skipping tests: `echo $ALWAYS_EXCEPT $EXCEPT $SANITYN_EXCEPT`" + + for O in $ONLY; do + eval ONLY_${O}=true + done + for E in $EXCEPT $ALWAYS_EXCEPT $SANITY_EXCEPT; do + eval EXCEPT_${E}=true + done +} + +_basetest() { + echo $* +} + +basetest() { + IFS=abcdefghijklmnopqrstuvwxyz _basetest $1 +} + run_test() { - for O in $ONLY; do - if [ "`echo $1 | grep '\<'$O'[a-z]*\>'`" ]; then - echo "" - run_one $1 "$2" - return $? - else - echo -n "." - fi - done - for X in $EXCEPT $ALWAYS_EXCEPT $SANITYN_EXCEPT; do - if [ "`echo $1 | grep '\<'$X'[a-z]*\>'`" ]; then - echo "skipping excluded test $1" - return 0 - fi - done - if [ -z "$ONLY" ]; then - run_one $1 "$2" - return $? - fi + export base=`basetest $1` + if [ "$ONLY" ]; then + testname=ONLY_$1 + if [ ${!testname}x != x ]; then + run_one $1 "$2" + return $? + fi + testname=ONLY_$base + if [ ${!testname}x != x ]; then + run_one $1 "$2" + return $? + fi + echo -n "." + return 0 + fi + testname=EXCEPT_$1 + if [ ${!testname}x != x ]; then + echo "skipping excluded test $1" + return 0 + fi + testname=EXCEPT_$base + if [ ${!testname}x != x ]; then + echo "skipping excluded test $1 (base $base)" + return 0 + fi + run_one $1 "$2" + return $? } [ "$SANITYLOG" ] && rm -f $SANITYLOG || true @@ -130,6 +157,8 @@ export DIR2=${DIR2:-$MOUNT2} rm -rf $DIR1/[df][0-9]* $DIR1/lnk +build_test_filter + test_1a() { touch $DIR1/f1 [ -f $DIR2/f1 ] || error @@ -347,7 +376,7 @@ test_14c() { # bug 3430 run_test 14c "open(O_TRUNC) of executing file return -ETXTBSY ==" test_15() { # bug 974 - ENOSPC - echo $PATH + echo "PATH=$PATH" sh oos2.sh $MOUNT1 $MOUNT2 } run_test 15 "test out-of-space with multiple writers ===========" -- 1.8.3.1