r219: Support checking on devel builds, too.

[nbd.git] / simple_test

diff --git a/simple_test b/simple_test
index 318385e..3432592 100755 (executable)
--- a/simple_test
+++ b/simple_test
@@ -4,12 +4,20 @@
 tmpnam=`mktemp`
 
 # Create a one-meg device
-dd if=/dev/zero -C /dev/null of=$tmpnam bs=1024 count=1024
+dd if=/dev/zero of=$tmpnam bs=1024 count=1024
 
-./nbd-server -p ./nbd-server.pid 11111 $tmpnam &
+./nbd-server -C /dev/null -p ./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
 exit $retval