From bd8b65394f0a1ffd0c7f8dd0d875c55ba219d9ec Mon Sep 17 00:00:00 2001 From: grev Date: Tue, 27 Nov 2007 20:57:53 +0000 Subject: [PATCH] b=13932 i=Adilger acc-sm "SLOW" list (all scripts) --- lustre/tests/acceptance-small.sh | 19 ++++++++++++++----- lustre/tests/conf-sanity.sh | 3 +++ lustre/tests/insanity.sh | 3 +++ lustre/tests/recovery-small.sh | 3 +++ lustre/tests/replay-dual.sh | 3 +++ lustre/tests/replay-ost-single.sh | 3 +++ lustre/tests/replay-single.sh | 5 ++++- lustre/tests/sanity.sh | 3 ++- lustre/tests/sanityN.sh | 2 +- 9 files changed, 36 insertions(+), 8 deletions(-) diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh index 517aa66..5570704 100755 --- a/lustre/tests/acceptance-small.sh +++ b/lustre/tests/acceptance-small.sh @@ -27,6 +27,11 @@ fi export TESTSUITE_LIST="RUNTESTS SANITY DBENCH BONNIE IOZONE FSX SANITYN LFSCK LIBLUSTRE REPLAY_SINGLE CONF_SANITY RECOVERY_SMALL REPLAY_OST_SINGLE REPLAY_DUAL INSANITY SANITY_QUOTA" +if [ "$SLOW" = "no" ]; then +# 5 min + export IOZONE="no" +fi + if [ "$ACC_SM_ONLY" ]; then for O in $TESTSUITE_LIST; do export ${O}="no" @@ -95,13 +100,17 @@ for NAME in $CONFIGS; do [ $THREADS -lt $DB_THREADS ] && DB_THREADS=$THREADS $DEBUG_OFF - bash rundbench 1 - $DEBUG_ON - $CLEANUP - $SETUP + duration="" + [ "$SLOW" = "no" ] && duration=" -t 120" + if [ "$SLOW" != "no" -o $DB_THREADS -eq 1 ]; then + bash rundbench 1 $duration + $DEBUG_ON + $CLEANUP + $SETUP + fi if [ $DB_THREADS -gt 1 ]; then $DEBUG_OFF - bash rundbench $DB_THREADS + bash rundbench $DB_THREADS $duration $DEBUG_ON $CLEANUP $SETUP diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 2a8d2fb..a483e3a 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -20,6 +20,9 @@ HEAD_EXCEPT=" 32a 32b 33" ALWAYS_EXCEPT=" $CONF_SANITY_EXCEPT $MOUNTCONFSKIP $HEAD_EXCEPT 22 23 36" # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! +# +[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 0 1 2 3 6 7 15 18 24b 25 30 31 32 33 34a " + SRCDIR=`dirname $0` PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh index df125aaf..d85bfb2 100755 --- a/lustre/tests/insanity.sh +++ b/lustre/tests/insanity.sh @@ -12,6 +12,9 @@ init_test_env $@ ALWAYS_EXCEPT="10 $INSANITY_EXCEPT" +# +[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT " + SETUP=${SETUP:-""} CLEANUP=${CLEANUP:-""} diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index c3065f5..d410d5a 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -5,6 +5,9 @@ set -e # bug 5494 7288 5493 ALWAYS_EXCEPT="24 27 52 $RECOVERY_SMALL_EXCEPT" +# +[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 0 1 2 3 6 7 15 18 24b 25 30 31 32 33 34a " + PTLDEBUG=${PTLDEBUG:--1} LUSTRE=${LUSTRE:-`dirname $0`/..} . $LUSTRE/tests/test-framework.sh diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh index c5bc7f1..1575ee1 100755 --- a/lustre/tests/replay-dual.sh +++ b/lustre/tests/replay-dual.sh @@ -5,6 +5,9 @@ set -e # bug number: 6088 10124 10800 ALWAYS_EXCEPT="8 15c 17 $REPLAY_DUAL_EXCEPT" +# +[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 1 2 3 4 5 14" + SAVE_PWD=$PWD PTLDEBUG=${PTLDEBUG:--1} LUSTRE=${LUSTRE:-`dirname $0`/..} diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh index bb4e364..28645a2 100755 --- a/lustre/tests/replay-ost-single.sh +++ b/lustre/tests/replay-ost-single.sh @@ -21,6 +21,9 @@ CPU=`awk '/model/ {print $4}' /proc/cpuinfo` # BUG NUMBER: ALWAYS_EXCEPT="$REPLAY_OST_SINGLE_EXCEPT" +# +[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT " + # It is replay-ost-single, after all OSTCOUNT=1 diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index e60eb33..d6472ab 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -21,6 +21,9 @@ GRANT_CHECK_LIST=${GRANT_CHECK_LIST:-""} # bug number: 2766 4176 ALWAYS_EXCEPT="0b 39 $REPLAY_SINGLE_EXCEPT" +# 63 min 7 min AT AT AT AT" +[ "SLOW" = "no" ] && EXCEPT="$EXCEPT 1 2 3 4 6 6b 12 16 44 44b 65 66 67 68" + build_test_filter cleanup_and_setup_lustre @@ -1141,7 +1144,7 @@ test_58() { replay_barrier $SINGLEMDS fail $SINGLEMDS sleep 2 - $CHECKSTAT -t file $DIR/$tdir/$tfile-* || return 1 + $CHECKSTAT -t file $DIR/$tdir/$tfile-* >/dev/null || return 1 do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0x0" unlinkmany $DIR/$tdir/$tfile-%d 2500 rmdir $DIR/$tdir diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index e6625536..48a3403 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -14,6 +14,7 @@ ALWAYS_EXCEPT=" 27o 27q 42a 42b 42c 42d 45 74b 75 $SANI # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! [ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 24o 27m 36f 36g 51b 51c 63 64b 68 71 73 101 115" +[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 24o 27m 36f 36g 51b 51c 60c 63 64b 68 71 73 78 101 103 115 120g" # Tests that fail on uml CPU=`awk '/model/ {print $4}' /proc/cpuinfo` @@ -4660,7 +4661,7 @@ test_124b() { MOUNTOPT="$MOUNTOPT,nolruresize" setup - NR=3000 + NR=2000 mkdir -p $DIR/$tdir || error "failed to create $DIR/$tdir" createmany -o $DIR/$tdir/f $NR diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh index 4ba69e8..5af953b 100644 --- a/lustre/tests/sanityN.sh +++ b/lustre/tests/sanityN.sh @@ -7,7 +7,7 @@ ONLY=${ONLY:-"$*"} ALWAYS_EXCEPT="14b 28 $SANITYN_EXCEPT" # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! -[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 16" +[ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 12 16" # Tests that fail on uml [ "$UML" = "true" ] && EXCEPT="$EXCEPT 7" -- 1.8.3.1