Oops

[nbd.git] / simple_test

diff --git a/simple_test b/simple_test
index 7a5b1d3..d7a698c 100755 (executable)
--- a/simple_test
+++ b/simple_test
@@ -3,40 +3,110 @@
 
 tmpnam=`mktemp`
 
+ulimit -c unlimited
+
 # Create a one-meg device
 dd if=/dev/zero of=$tmpnam bs=1024 count=1024
 
-./nbd-server -C /dev/null -p `pwd`/nbd-server.pid 11111 $tmpnam &
-# -p only works if nbd-server wasn't compiled with -DNOFORK or -DNODAEMON,
-# which I sometimes do for testing and debugging.
-PID=$!
-sleep 1
-./nbd-tester-client localhost 11111
-retval=$?
+echo $1
+
+case $1 in
+       */cmd)
+               # Test with export specified on command line
+               ./nbd-server -C /dev/null -p `pwd`/nbd-server.pid 11111 $tmpnam &
+               # -p only works if nbd-server wasn't compiled with -DNOFORK or
+               # -DNODAEMON, which I sometimes do for testing and debugging.
+               PID=$!
+               sleep 1
+               ./nbd-tester-client 127.0.0.1 11111
+               retval=$?
+       ;;
+
+       */cfg1)
+               # Test with export specified in config file
+               cat > nbd-server.conf <<EOF
+[generic]
+       oldstyle = true
+[export]
+       exportname = $tmpnam
+       port = 11112
+EOF
+               ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
+               PID=$!
+               sleep 1
+               ./nbd-tester-client 127.0.0.1 11112
+               retval=$?
+       ;;
+       */cfgmulti)
+               # Test with multiple exports specified in config file, and
+               # testing more options too
+               cat >nbd-server.conf <<EOF
+[generic]
+       oldstyle = true
+[export1]
+       exportname = $tmpnam
+       port = 11113
+       copyonwrite = true
+       listenaddr = 127.0.0.1
+[export2]
+       exportname = $tmpnam
+       port = 11114
+       readonly = true
+       listenaddr = 127.0.0.1
+EOF
+               ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
+               PID=$!
+               sleep 1
+               ./nbd-tester-client localhost 11113
+               retval=$?
+               if [ $retval -ne 0 ]
+               then
+                       if [ -f nbd-server.pid ]
+                       then
+                               kill `cat nbd-server.pid`
+                               rm -f nbd-server.pid
+                       else
+                               kill $PID
+                       fi
+                       if [ -z "$2" ]
+                       then
+                               rm -f $tmpnam nbd-server.conf
+                       fi
+                       exit $retval
+               fi
+               ./nbd-tester-client localhost 11114
+               retval=$?
+       ;;
+       */cfgnew)
+               # Test new-style exports
+               cat >nbd-server.conf <<EOF
+[generic]
+[export1]
+       exportname = $tmpnam
+EOF
+               ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
+               PID=$!
+               sleep 1
+               ./nbd-tester-client localhost -N export1
+               retval=$?
+       ;;
+       *)
+               echo "E: unknown test $1"
+               exit 1
+       ;;
+esac
 if [ -f nbd-server.pid ]
 then
        kill `cat nbd-server.pid`
+       rm -f nbd-server.pid
 else
        kill $PID
 fi
-rm -f nbd-server.pid
+if [ -z "$2" ]
+then
+       rm -f $tmpnam nbd-server.conf
+fi
 if [ $retval -ne 0 ]
 then
-       rm -f $tmpnam
        exit $retval
 fi
-cat > nbd-server.conf <<EOF
-[generic]
-[export]
-       exportname = $tmpnam
-       port = 11111
-EOF
-./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
-PID=$!
-sleep 1
-./nbd-tester-client localhost 11111
-retval=$?
-rm -f nbd-server.pid
-rm -f nbd-server.conf
-rm -f $tmpnam
-exit $retval