r222: * Clean up temporary files after we quit

[nbd.git] / simple_test

diff --git a/simple_test b/simple_test
index 06af876..8b62f29 100755 (executable)
--- a/simple_test
+++ b/simple_test
@@ -6,10 +6,19 @@ tmpnam=`mktemp`
 # Create a one-meg device
 dd if=/dev/zero of=$tmpnam bs=1024 count=1024
 
-./nbd-server -C /dev/null -p ./nbd-server.pid 11111 $tmpnam &
+./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
 retval=$?
-kill `cat nbd-server.pid`
+if [ -f nbd-server.pid ]
+then
+       kill `cat nbd-server.pid`
+else
+       kill $PID
+fi
 rm -f nbd-server.pid
+rm -f $tmpnam
 exit $retval