r337: Check multi-file export in 'make check', too; and tell automake that we have...

[nbd.git] / simple_test

diff --git a/simple_test b/simple_test
index 71226f2..4b6b521 100755 (executable)
--- a/simple_test
+++ b/simple_test
@@ -6,43 +6,83 @@ tmpnam=`mktemp`
 # 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=$?
-if [ -f nbd-server.pid ]
-then
-       kill `cat nbd-server.pid`
-else
-       kill $PID
-fi
-rm -f nbd-server.pid
-if [ $retval -ne 0 ]
-then
-       rm -f $tmpnam
-       exit $retval
-fi
-cat > nbd-server.conf <<EOF
+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 localhost 11111
+               retval=$?
+       ;;
+
+       ./cfg1)
+               # Test with export specified in config file
+               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=$?
+               ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
+               PID=$!
+               sleep 1
+               ./nbd-tester-client localhost 11111
+               retval=$?
+       ;;
+       ./cfgmulti)
+               # Test with multiple exports specified in config file, and
+               # testing more options too
+               cat >nbd-server.conf <<EOF
+[generic]
+[export1]
+       exportname = $tmpnam
+       port = 11111
+       copyonwrite = true
+       listenaddr = 127.0.0.1
+[export2]
+       exportname = $tmpnam
+       port = 11112
+       readonly = true
+EOF
+               ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
+               PID=$!
+               sleep 1
+               ./nbd-tester-client localhost 11111
+               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
+                       rm -f $tmpnam nbd-server.conf
+                       exit $retval
+               fi
+               ./nbd-tester-client localhost 11112
+               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
-rm -f nbd-server.conf
-rm -f $tmpnam
-exit $retval
+if [ $retval -ne 0 ]
+then
+       exit $retval
+fi
+rm -f $tmpnam nbd-server.conf