Merge pull request #28 from mgorny/fix-tests-hang

miniupnpc: fix killing the test server.
miniupnp · Feb 11, 2013 · 496737b · 496737b
2 parents d50eaf3 + a3e8540
commit 496737b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/miniupnpc/testminiwget.sh b/miniupnpc/testminiwget.sh
@@ -39,6 +39,7 @@ esac
 
 # launching the test HTTP server
 ./minihttptestserver $SERVERARGS -e $EXPECTEDFILE > $HTTPSERVEROUT &
+SERVERPID=$!
 while [ -z "$PORT" ]; do
 	sleep 1
 	PORT=`cat $HTTPSERVEROUT | sed 's/Listening on port \([0-9]*\)/\1/' `
@@ -77,8 +78,8 @@ else
 fi
 
 # kill the test HTTP server
-kill %1
-wait %1
+kill $SERVERPID
+wait $SERVERPID
 
 # remove temporary files (for success cases)
 if [ $RET -eq 0 ]; then