From 39291e8cc1e0552795a33bd7211638508624e429 Mon Sep 17 00:00:00 2001 From: "robert.read" Date: Fri, 2 Oct 2009 23:50:08 +0000 Subject: [PATCH] Branch HEAD b=20784,20719 Disable test 214 because of bug 20784. Revert skip_env changes in test 68a,b. --- lustre/tests/sanity.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 692dec1..9346688 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -9,8 +9,8 @@ set -e ONLY=${ONLY:-"$*"} -# bug number for skipped test: 13297 2108 9789 3637 9789 3561 12622 12653 12653 5188 10764 16260 -ALWAYS_EXCEPT=" 27u 42a 42b 42c 42d 45 51d 65a 65e 68b 75 119d $SANITY_EXCEPT" +# bug number for skipped test: 13297 2108 9789 3637 9789 3561 12622 12653 12653 5188 10764 16260 20784 +ALWAYS_EXCEPT=" 27u 42a 42b 42c 42d 45 51d 65a 65e 68b 75 119d 215 $SANITY_EXCEPT" # bug number for skipped test: 2108 9789 3637 9789 3561 5188/5749 1443 #ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"27m 42a 42b 42c 42d 45 68 76"} # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! @@ -3241,7 +3241,7 @@ test_68a() { [ "$UID" != 0 ] && skip_env "must run as root" && return grep -q llite_lloop /proc/modules - [ $? -ne 0 ] && skip_env "can't find module llite_lloop" && return + [ $? -ne 0 ] && skip "can't find module llite_lloop" && return LLOOP=$TMP/lloop.`date +%s`.`date +%N` dd if=/dev/zero of=$DIR/f68a bs=4k count=1024 @@ -3264,7 +3264,7 @@ test_68b() { # was test_68 skip "local OST" && return grep -q llite_lloop /proc/modules - [ $? -ne 0 ] && skip_env "can't find module llite_lloop" && return + [ $? -ne 0 ] && skip "can't find module llite_lloop" && return [ -z "`$LCTL list_nids | grep -v tcp`" ] && \ skip "can't reliably test swap with TCP" && return -- 1.8.3.1