From: Wouter Verhelst <w@uter.be>
Date: Fri, 6 Aug 2010 00:37:45 +0000 (-0400)
Subject: Fix simple_test for named exports
X-Git-Url: http://git.alex.org.uk?ds=sidebyside

Fix simple_test for named exports

Old-style exports require the oldstyle=true option in the 'generic'
section; so add that.

Prepare simple_test for support for named exports in nbd-tester-client,
too, but that still needs to be implemented.
---

diff --git a/simple_test b/simple_test
index 6bae6d4..9bd3d07 100755
--- a/simple_test
+++ b/simple_test
@@ -24,6 +24,7 @@ case $1 in
 		# Test with export specified in config file
 		cat > nbd-server.conf <<EOF
 [generic]
+	oldstyle = true
 [export]
 	exportname = $tmpnam
 	port = 11112
@@ -39,6 +40,7 @@ EOF
 		# testing more options too
 		cat >nbd-server.conf <<EOF
 [generic]
+	oldstyle = true
 [export1]
 	exportname = $tmpnam
 	port = 11113
@@ -69,6 +71,38 @@ EOF
 		./nbd-tester-client localhost 11114
 		retval=$?
 	;;
+	*/cfgnew)
+		# Test new-style exports
+		cat >nbd-server.conf <<EOF
+[generic]
+[export1]
+	exportname = $tmpnam
+	copyonwrite = true
+	listenaddr = 127.0.0.1
+[export2]
+	exportname = $tmpnam
+	readonly = true
+EOF
+		./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
+		PID=$!
+		sleep 1
+		./nbd-tester-client localhost -N export1
+		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 -N export2
+		retval=$?
+	;;
 	*)
 		echo "E: unknown test $1"
 		exit 1