From: yoe <yoe>
Date: Thu, 19 Jul 2007 08:50:47 +0000 (+0000)
Subject: r265: Check whether the program runs with a config file rather than stuff on the... 
X-Git-Url: http://git.alex.org.uk?hp=6a813442027e50e183656670ee4fdd7ce09eb5d0

r265: Check whether the program runs with a config file rather than stuff on the cmdline, too
---

diff --git a/simple_test b/simple_test
index 8b62f29..b19e968 100755
--- a/simple_test
+++ b/simple_test
@@ -20,5 +20,23 @@ 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
+[generic]
+[export]
+	exportname = `pwd`/$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