r288: Don't forget to kill nbd-server the second time; thanks to Patrice Dumas

[nbd.git] / simple_test

diff --git a/simple_test b/simple_test
index b19e968..71226f2 100755 (executable)
--- a/simple_test
+++ b/simple_test
@@ -28,7 +28,7 @@ fi
 cat > nbd-server.conf <<EOF
 [generic]
 [export]
-       exportname = `pwd`/$tmpnam
+       exportname = $tmpnam
        port = 11111
 EOF
 ./nbd-server -C nbd-server.conf -p `pwd`/nbd-server.pid &
@@ -36,6 +36,12 @@ 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
 rm -f nbd-server.conf
 rm -f $tmpnam