X-Git-Url: http://git.alex.org.uk

diff --git a/simple_test b/simple_test
index 4b6b521..d7a698c 100755
--- a/simple_test
+++ b/simple_test
@@ -3,56 +3,61 @@
 
 tmpnam=`mktemp`
 
+ulimit -c unlimited
+
 # Create a one-meg device
 dd if=/dev/zero of=$tmpnam bs=1024 count=1024
 
 echo $1
 
 case $1 in
-	./cmd)
+	*/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
+		./nbd-tester-client 127.0.0.1 11111
 		retval=$?
 	;;
 
-	./cfg1)
+	*/cfg1)
 		# 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)
+	*/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 = 11111
+	port = 11113
 	copyonwrite = true
 	listenaddr = 127.0.0.1
 [export2]
 	exportname = $tmpnam
-	port = 11112
+	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 11111
+		./nbd-tester-client localhost 11113
 		retval=$?
 		if [ $retval -ne 0 ]
 		then
@@ -63,10 +68,26 @@ EOF
 			else
 				kill $PID
 			fi
-			rm -f $tmpnam nbd-server.conf
+			if [ -z "$2" ]
+			then
+				rm -f $tmpnam nbd-server.conf
+			fi
 			exit $retval
 		fi
-		./nbd-tester-client localhost 11112
+		./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=$?
 	;;
 	*)
@@ -81,8 +102,11 @@ then
 else
 	kill $PID
 fi
+if [ -z "$2" ]
+then
+	rm -f $tmpnam nbd-server.conf
+fi
 if [ $retval -ne 0 ]
 then
 	exit $retval
 fi
-rm -f $tmpnam nbd-server.conf