Fix simple_test for named exports

[nbd.git] / simple_test

diff --git a/simple_test b/simple_test
index ddaa86e..9bd3d07 100755 (executable)
--- a/simple_test
+++ b/simple_test
@@ -16,7 +16,7 @@ case $1 in
                # -DNODAEMON, which I sometimes do for testing and debugging.
                PID=$!
                sleep 1
-               ./nbd-tester-client localhost 11111
+               ./nbd-tester-client 127.0.0.1 11111
                retval=$?
        ;;
 
@@ -24,14 +24,15 @@ case $1 in
                # Test with export specified in config file
                cat > nbd-server.conf <<EOF
 [generic]
+       oldstyle = true
 [export]
        exportname = $tmpnam
-       port = 11111
+       port = 11112
 EOF
                ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
                PID=$!
                sleep 1
-               ./nbd-tester-client localhost 11111
+               ./nbd-tester-client 127.0.0.1 11112
                retval=$?
        ;;
        */cfgmulti)
@@ -39,20 +40,53 @@ EOF
                # 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
+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
+                       rm -f $tmpnam nbd-server.conf
+                       exit $retval
+               fi
+               ./nbd-tester-client localhost 11114
+               retval=$?
+       ;;
+       */cfgnew)
+               # Test new-style exports
+               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
+               ./nbd-tester-client localhost -N export1
                retval=$?
                if [ $retval -ne 0 ]
                then
@@ -66,7 +100,7 @@ EOF
                        rm -f $tmpnam nbd-server.conf
                        exit $retval
                fi
-               ./nbd-tester-client localhost 11112
+               ./nbd-tester-client localhost -N export2
                retval=$?
        ;;
        *)