--- trunk/tests/store-server-closes-immediately.sh	2008/05/31 21:39:39	114
+++ trunk/tests/store-server-closes-immediately.sh	2008/06/03 02:41:23	130
@@ -18,16 +18,16 @@
 
 set -e
 
-function shutdown() {
+shutdown() {
   wget -q -O- --post-data= "http://127.0.0.1:${server_port}/jscoverage-shutdown" > /dev/null
   wait $server_pid
 }
 
-function cleanup() {
+cleanup() {
   shutdown
   if [ "$origin_server_pid" != "" ]
   then
-    kill $origin_server_pid
+    kill -9 $origin_server_pid
   fi
 }
 
@@ -55,4 +55,4 @@
 wget --post-file=TMP -q -O- -e 'http_proxy=http://127.0.0.1:8080/' http://127.0.0.1:8000/jscoverage-store > /dev/null
 js json-cmp.js store-source-urls.expected.json DIR/jscoverage.json
 sort ERR -o ERR
-diff store-source-urls.expected.err ERR
+diff --strip-trailing-cr store-source-urls.expected.err ERR