small bug fixes

diff --git a/tests/Makefile b/tests/Makefile
index 30ad07708cf59a7c1f9c7387bee295db7f45e850..a46c15cfc09851f37906e680f2c774f3603acc3f 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,7 +3,7 @@ CFLAGS=-g -Wall -Werror -m32
 LEN=60
 OPT=-w
 
-all: wtests2
+all: wtest2
 
 utests: cleanup
        sh j-reg.sh
@@ -61,16 +61,22 @@ wtests: progs
 
 wtest2:
        sh w-racer.sh $(OPT) ext2 30
-       sh w-racer.sh $(OPT) xfs 30
-       sh w-racer.sh $(OPT) reiserfs 30
-       sh w-racer.sh $(OPT) tmpfs 30
+       sh w-racer.sh $(OPT) ext3 30
+       sh w-racer.sh $(OPT) ext4 30
+       #sh w-racer.sh $(OPT) xfs 30
+       #sh w-racer.sh $(OPT) reiserfs 30
+       #sh w-racer.sh $(OPT) tmpfs 30
+
+wtest_quick:
+       sh w-racer.sh $(OPT) ext2 5
+       sh w-racer.sh $(OPT) ext3 5
+       sh w-racer.sh $(OPT) ext4 5
+       sh w-racer.sh $(OPT) xfs 5
+       sh w-racer.sh $(OPT) reiserfs 5
+       sh w-racer.sh $(OPT) tmpfs 5
 
 oldall: progs tests # ntests longntests
 
-wtests2:
-       sh w-racer.sh -w ext3 30
-#      sh w-racer.sh ext3 30
-
 progs: cmpd cmpi keepopen mapper3 open-ro-close open-rw-close \
        open-unlink open-write opendir re-read mapper-re-read chmodl \
        seek-dir aoptest creat-unlink mk-core append

diff --git a/tests/w-racer.sh b/tests/w-racer.sh
index 63ec9a2c819ce4dae0481ef077867f466b16b89f..2f34765d12f5dfd34598065f00f494c6cb26894c 100755 (executable)
--- a/tests/w-racer.sh
+++ b/tests/w-racer.sh
@@ -4,7 +4,7 @@
 ##############################################################################
 # scratch device to mount on /n/scratch
 #SCRATCH_DEV=/dev/hdd2
-SCRATCH_DEV=/dev/sdb1
+SCRATCH_DEV=/dev/sdb
 
 function runcmd
 {
@@ -78,11 +78,11 @@ fi
 
 case "$lowertype" in
     ext2 | ext3 | ext4 | reiserfs )
-       runcmd mkfs -t $lowertype -q $SCRATCH_DEV
+       runcmd mkfs -t $lowertype -q $SCRATCH_DEV <<< $(echo y)
        runcmd mount -t $lowertype $SCRATCH_DEV /n/scratch
        ;;
     xfs )
-       runcmd mkfs -t $lowertype -q -f $SCRATCH_DEV
+       runcmd mkfs -t $lowertype -q -f $SCRATCH_DEV <<< $(echo y)
        runcmd mount -t $lowertype $SCRATCH_DEV /n/scratch
        ;;
     tmpfs )
@@ -93,7 +93,7 @@ case "$lowertype" in
        ;;
     nfs )
        runcmd mkdir -p /n/lower
-       runcmd mkfs -t ext3 -q $SCRATCH_DEV
+       runcmd mkfs -t ext3 -q $SCRATCH_DEV <<< $(echo y)
        runcmd mount -t ext3  $SCRATCH_DEV /n/lower
        runcmd exportfs -o no_root_squash,rw localhost:/n/lower
        runcmd mount -t $lowertype localhost:/n/lower /n/scratch
@@ -114,7 +114,7 @@ esac
 runcmd find /tmp -ls
 runcmd df /tmp
 runcmd df -i /tmp
-runcmd ../racer/fsl-racer.sh /tmp/r ${2:-60}
+runcmd ../racer/racer-fsl.sh /tmp/r ${2:-60}
 runcmd sync
 if test $? != 0 ; then
     ps -ef | grep bash
@@ -149,4 +149,4 @@ runcmd sync # to let lower inodes/blocks purge before "df"
 
 cleanup
 
-./j-scanlog.sh
+./w-scanlog.sh

diff --git a/update-stable.sh b/update-stable.sh
index e49b41bcbce29485663eace2759ed10c7de6423d..b2a357dbf5599530bf99c52e4ccbb81a402a6d7a 100755 (executable)
--- a/update-stable.sh
+++ b/update-stable.sh
@@ -35,7 +35,7 @@ fi
 #echo THIS_REPO:$THIS_REPO
 case "$THIS_REPO" in
     2.6.* | 3.* | 4.* | 5.* )
-       BRANCH="linux-${THIS_REPO}.y"
+       BRANCH="linux-${THIS_REPO}"
        ;;
     latest )
        BRANCH="master"

diff --git a/wrapfs-fix-branch.sh b/wrapfs-fix-branch.sh
index ac5df22dd23200d83a93828be1eb5097333bb7ba..ccf568d888b7337f4819ad547dcc134ea3431b5a 100755 (executable)
--- a/wrapfs-fix-branch.sh
+++ b/wrapfs-fix-branch.sh
@@ -83,7 +83,7 @@ case "$WRAPFS_REPO" in
        LINUX_REPO="torvalds/linux.git"
         LINUX_BRANCH="korg/master"
        ;;
-    wrapfs-2.* | wrapfs-3.* | wrapfs-4.* )
+    wrapfs-2.* | wrapfs-3.* | wrapfs-4.* | wrapfs-5.* )
        LINUX_REPO="stable/linux-stable.git"
         LINUX_BRANCH=$(get_linux_version $LOCATION/Makefile)
         LINUX_BRANCH="v$LINUX_BRANCH"