--- trunk/tests/store-unreadable-json.sh	2008/05/31 21:39:39	114
+++ trunk/tests/store-unreadable-json.sh	2008/10/23 20:10:48	337
@@ -18,12 +18,22 @@
 
 set -e
 
-function shutdown() {
+. common.sh
+
+# skip on windows
+uname=`uname`
+case "$uname" in
+  CYGWIN* | MINGW*)
+    exit 77
+    ;;
+esac
+
+shutdown() {
   wget -q -O- --post-data= "http://127.0.0.1:${server_port}/jscoverage-shutdown" > /dev/null
   wait $server_pid
 }
 
-function cleanup() {
+cleanup() {
   shutdown
 }
 
@@ -39,7 +49,7 @@
 fi
 
 rm -fr DIR
-$VALGRIND jscoverage-server --document-root=recursive --report-dir=DIR > OUT 2> ERR &
+$VALGRIND jscoverage-server --no-highlight --document-root=recursive --report-dir=DIR > OUT 2> ERR &
 server_pid=$!
 server_port=8080
 
@@ -48,7 +58,7 @@
 cat store.json | sed "s/@PREFIX@/\\//g" > TMP
 wget --post-file=TMP -q -O- http://127.0.0.1:8080/jscoverage-store > /dev/null
 cat store.expected.json | sed "s/@PREFIX@/\\//g" > TMP
-js json-cmp.js TMP DIR/jscoverage.json
+json_cmp TMP DIR/jscoverage.json
 
 chmod -r DIR/jscoverage.json