--- trunk/tests/store-source-not-found.sh	2008/05/31 21:39:39	114
+++ trunk/tests/store-source-not-found.sh	2008/10/26 21:15:24	366
@@ -18,19 +18,19 @@
 
 set -e
 
-function shutdown() {
+. common.sh
+
+shutdown() {
   wget -q -O- --post-data= "http://127.0.0.1:${server_port}/jscoverage-shutdown" > /dev/null
   wait $server_pid
 }
 
-function cleanup() {
+cleanup() {
   shutdown
 }
 
 trap 'cleanup' 0 1 2 3 15
 
-export PATH=.:..:../js:$PATH
-
 if [ -z "$VALGRIND" ]
 then
   delay=0.2
@@ -46,5 +46,5 @@
 sleep $delay
 
 wget --post-file=store-source-not-found.json -q -O- http://127.0.0.1:8080/jscoverage-store > /dev/null
-js json-cmp.js store-source-not-found.expected.json DIR/jscoverage.json
-diff store-source-not-found.expected.err ERR
+json_cmp store-source-not-found.expected.json DIR/jscoverage.json
+diff --strip-trailing-cr store-source-not-found.expected.err ERR