Branch b_release_1_4_6

Give run-llog.sh script half a chance to work under 2.6 (currently excluded
from sanity.sh)

diff --git a/lustre/tests/llog-test.sh b/lustre/tests/llog-test.sh
index 4044610..98b8d12 100644 (file)
--- a/lustre/tests/llog-test.sh
+++ b/lustre/tests/llog-test.sh
@@ -79,6 +79,7 @@ run_test 0 "Prepare fileset"
 test_1() {
     ./chownmany 1000 $DIR/llog-%d $LCOUNT
     sleep 5
+    $CHECKSTAT -u \#1000 $DIR/llog-* || return 4
 }
 run_test 1 "Do chowns"
 
@@ -88,13 +89,14 @@ test_2() {
     fail ost
     ./chownmany 500 $DIR/llog-%d $HALFCOUNT $LCOUNT
     sleep 5
+    $CHECKSTAT -u \#500 $DIR/llog-* || return 5
 }
-#run_test 2 "Fail OST during chown"
+run_test 2 "Fail OST during chown"
 
 test_3() {
     ./unlinkmany $DIR/llog-%d $LCOUNT
     sleep 2
-    $CHECKSTAT -t file $DIR/llog-* && return 1 || true
+    $CHECKSTAT -t file $DIR/llog-* && return 10 || true
 }
 run_test 3 "Remove testset"
 

diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index b7201f2..515a347 100644 (file)
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -5,7 +5,11 @@ TMP=${TMP:-/tmp}
 MDS=`ls /proc/fs/lustre/mds | grep -v num_refs | head -n 1`
 [ -z "$MDS" ] && echo "no MDS available, skipping llog test" && exit 0
 
-insmod ../obdclass/llog_test.o || exit 1
+case `uname -r` in
+2.4.*) insmod ../obdclass/llog_test.o || exit 1 ;;
+2.6.*) insmod ../obdclass/llog_test.ko || exit 1 ;;
+*) echo "unknown kernel version `uname -r`" && exit 99 ;;
+esac
 lctl modules > $TMP/ogdb-`hostname`
 echo "NOW reload debugging syms.."