- minor fixes to the tests

diff --git a/lustre/tests/runtests b/lustre/tests/runtests
index 58556c2..5c80ea5 100755 (executable)
--- a/lustre/tests/runtests
+++ b/lustre/tests/runtests
@@ -76,7 +76,7 @@ echo "creating $DST"
 mkdir $DST || fail "can't mkdir $DST" 10
 
 # ok, that hopefully worked, so let's do a little more
-FILES=`find $SRC -type f | head -$COUNT`
+FILES=`find $SRC -type f | grep -v mtab | head -$COUNT`
 echo "copying files from $SRC to $DST$SRC"
 tar cf - $FILES | tar xvf - -C $DST || fail "copying $SRC" 11
 

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 38fd185..9f0b993 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -1,36 +1,36 @@
-!/bin/bash
+#!/bin/bash
 
 echo '=============================== test 1'
 mkdir /mnt/lustre/d1
 mkdir /mnt/lustre/d1/d2
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '=============================== test 2'
 mkdir /mnt/lustre/d2
 touch /mnt/lustre/d2/f
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '===============================' test 3
 mkdir /mnt/lustre/d3
 umount /mnt/lustre
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 touch /mnt/lustre/d3/f
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '===============================' test 4
 mkdir /mnt/lustre/d4
 umount /mnt/lustre
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 mkdir /mnt/lustre/d4/d2
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '===============================' test 5
 mkdir /mnt/lustre/d5
@@ -38,14 +38,14 @@ mkdir /mnt/lustre/d5/d2
 chmod 0666 /mnt/lustre/d5/d2
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '===============================' test 6
 touch /mnt/lustre/f6
 chmod 0666 /mnt/lustre/f6
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '===============================' test 7
 mkdir /mnt/lustre/d7
@@ -53,7 +53,7 @@ mkdir /mnt/lustre/d7
 chmod 0666 /mnt/lustre/d7/f
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '===============================' test 8
 mkdir /mnt/lustre/d8
@@ -61,7 +61,7 @@ touch /mnt/lustre/d8/f
 chmod 0666 /mnt/lustre/d8/f
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 
 echo '=============9=================' test 9
@@ -70,7 +70,7 @@ mkdir /mnt/lustre/d9/d2
 mkdir /mnt/lustre/d9/d2/d3
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 
 echo '===============================' test 10
@@ -79,7 +79,7 @@ mkdir /mnt/lustre/d10/d2
 touch /mnt/lustre/d10/d2/f
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '===============================' test 11
 mkdir /mnt/lustre/d11
@@ -88,7 +88,7 @@ chmod 0666 /mnt/lustre/d11/d2
 chmod 0555 /mnt/lustre/d11/d2
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '===============================' test 12
 mkdir /mnt/lustre/d12
@@ -97,7 +97,7 @@ chmod 0666 /mnt/lustre/d12/f
 chmod 0555 /mnt/lustre/d12/f
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '===============================' test 13
 mkdir /mnt/lustre/d13
@@ -105,7 +105,7 @@ cp /etc/passwd /mnt/lustre/d13/f
 >  /mnt/lustre/d13/f
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '===============================' test 14
 mkdir /mnt/lustre/d14
@@ -113,7 +113,7 @@ touch /mnt/lustre/d14/f
 rm /mnt/lustre/d14/f
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '===============================' test 15
 mkdir /mnt/lustre/d15
@@ -121,7 +121,7 @@ touch /mnt/lustre/d15/f
 mv /mnt/lustre/d15/f /mnt/lustre/d15/f2
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
 echo '===============================' test 16
 mkdir /mnt/lustre/d16
@@ -129,9 +129,9 @@ touch /mnt/lustre/d16/f
 rm -rf /mnt/lustre/d16/f
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml
 
-echo '===============================' test 17
+echo '====== symlinks: create, remove symlinks (dangling and real) =====' test 17
 mkdir /mnt/lustre/d17
 touch /mnt/lustre/d17/f
 ln -s /mnt/lustre/d17/f /mnt/lustre/d17/l-exist
@@ -141,4 +141,4 @@ rm -f /mnt/lustre/l-dangle
 rm -f /mnt/lustre/l-exist
 umount /mnt/lustre
 dmesg | grep -i destruct
-../utils/lconf --start 70 local.xml
+../utils/lconf --minlevel 70 local.xml