Add integrity test for huge writes. Fix speed calc problem.

[nbd.git] / simple_test

diff --git a/simple_test b/simple_test
index 1ccf84b..c790311 100755 (executable)
--- a/simple_test
+++ b/simple_test
@@ -5,6 +5,7 @@ tmpdir=`mktemp -d`
 conffile=${tmpdir}/nbd.conf
 pidfile=${tmpdir}/nbd.pid
 tmpnam=${tmpdir}/nbd.dd
+mydir=$(dirname "`readlink -f $0`")
 
 ulimit -c unlimited
 
@@ -145,7 +146,25 @@ EOF
                ./nbd-server -C ${conffile} -p ${pidfile} &
                PID=$!
                sleep 1
-               ./nbd-tester-client localhost -N export1 -i -t $(dirname $1)/integrity-test.tr
+               ./nbd-tester-client localhost -N export1 -i -t ${mydir}/integrity-test.tr
+               retval=$?
+       ;;
+       */integrityhuge)
+               # Integrity test
+               cat >${conffile} <<EOF
+[generic]
+[export1]
+       exportname = $tmpnam
+       flush = true
+       fua = true
+       rotational = true
+EOF
+               # we need a bigger disk
+               dd if=/dev/zero of=$tmpnam bs=1M count=50 >/dev/null 2>&1
+               ./nbd-server -C ${conffile} -p ${pidfile} &
+               PID=$!
+               sleep 1
+               ./nbd-tester-client localhost -N export1 -i -t ${mydir}/integrityhuge-test.tr
                retval=$?
        ;;
        *)