Fix killing the test server.
The '%1' argument seems to be non-POSIX and does not work well with dash. Store the forked PID instead, and use it directly to kill the server.
This commit is contained in:
parent
d50eaf3c52
commit
a3e8540cd0
|
@ -39,6 +39,7 @@ esac
|
||||||
|
|
||||||
# launching the test HTTP server
|
# launching the test HTTP server
|
||||||
./minihttptestserver $SERVERARGS -e $EXPECTEDFILE > $HTTPSERVEROUT &
|
./minihttptestserver $SERVERARGS -e $EXPECTEDFILE > $HTTPSERVEROUT &
|
||||||
|
SERVERPID=$!
|
||||||
while [ -z "$PORT" ]; do
|
while [ -z "$PORT" ]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
PORT=`cat $HTTPSERVEROUT | sed 's/Listening on port \([0-9]*\)/\1/' `
|
PORT=`cat $HTTPSERVEROUT | sed 's/Listening on port \([0-9]*\)/\1/' `
|
||||||
|
@ -77,8 +78,8 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# kill the test HTTP server
|
# kill the test HTTP server
|
||||||
kill %1
|
kill $SERVERPID
|
||||||
wait %1
|
wait $SERVERPID
|
||||||
|
|
||||||
# remove temporary files (for success cases)
|
# remove temporary files (for success cases)
|
||||||
if [ $RET -eq 0 ]; then
|
if [ $RET -eq 0 ]; then
|
||||||
|
|
Loading…
Reference in New Issue