@@ -6,6 +6,7 @@ tmpdir="$TMPDIR" test -z "$tmpdir" && tmpdir=/tmp tmpf="${tmpdir}/bnch$$" nc='nc -q 1' +nc -q 1 2>&1 | grep -q option && nc='nc -w 1' # workaround for older netcat commands="$1"; shift expected="$1"; shift @@ -37,7 +38,7 @@ fi bpid=$! sleep .1 -if ! ps $bpid >/dev/null; then +if ! ps -p $bpid >/dev/null; then echo "Could not start beanstalkd for testing, port $port is taken" exit 2 fi check-one.sh @@ -8,6 +8,7 @@ out1="${tmpdir}/bnch$$.1" out2="${tmpdir}/bnch$$.2" logdir="${tmpdir}/bnch$$.d" nc='nc -q 1' +nc -q 1 2>&1 | grep -q option && nc='nc -w 1' # workaround for older netcat killbeanstalkd() { { @@ -41,7 +42,7 @@ mkdir -p $logdir bpid=$! sleep .1 -if ! ps $bpid >/dev/null; then +if ! ps -p $bpid >/dev/null; then echo "Could not start beanstalkd for testing (possibly port $port is taken)" exit 2 fi @@ -64,7 +65,7 @@ sleep .1 bpid=$! sleep .1 -if ! ps $bpid >/dev/null; then +if ! ps -p $bpid >/dev/null; then echo "Could not start beanstalkd for testing (possibly port $port is taken)" exit 2 fi sh-tests/binlog-basic.sh af441c93dc6058e882b8dc2ab84002ad1ec89e79 Keith Rarick kr@xph.us http://github.com/kr/beanstalkd/commit/95ff7060d7b0ca92dfd472fcd5719272831b519c 95ff7060d7b0ca92dfd472fcd5719272831b519c 2009-05-15T16:33:36-07:00 2009-05-15T16:33:36-07:00 Make shell tests run on Solaris too. 38185adad4bb19f9645786e5b0b91d24acdc8a47 Keith Rarick kr@xph.us