Branch b1_5

b=9858
full ost tests don't work on uml

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 570fdf0..8b43c31 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -14,13 +14,9 @@ ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"42a 42b  42c  42d  45   68"}
 [ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 24o 27m 51b 51c 63 64b 71 77 101"
 
 # Tests that fail on uml, maybe elsewhere, FIXME
-# 31d works on my real system
 CPU=`awk '/model/ {print $4}' /proc/cpuinfo`
-[ "$CPU" = "UML" ] && EXCEPT="$EXCEPT 31d 54a 65a 65b 65c 65d 65e 99a 99b 99c 99d 99e 99f"
-
-# Tests that always fail with mountconf -- FIXME
-# 48a moving the working dir succeeds
-EXCEPT="$EXCEPT 48a"
+#                                     buffer i/o errs             sock spc runas
+[ "$CPU" = "UML" ] && EXCEPT="$EXCEPT 27m 27n 27o 27p 27q 27r 31d 54a  64b 99a 99b 99c 99d 99e 99f"
 
 case `uname -r` in
 2.4*) FSTYPE=${FSTYPE:-ext3};    ALWAYS_EXCEPT="$ALWAYS_EXCEPT 76" ;;