Fix tests on OSX

Author: ingydotnet

lib/json.bash

@@ -122,7 +122,7 @@ JSON._dump() {
       fi
     done
     prev=("${line[@]}")
-  done < <(sort -k1,1V -u; )
+  done < <(sort -k '1,1' -u )
   local indent=$(( ${#stack} - 1 ))
   for (( i=0; i<${#stack}; i++ )); do
     if [ "${stack:$i:1}" = "a" ]; then

test/dump.t

@@ -28,7 +28,7 @@ test_dump() {
     dbg json2
     is "$json2" "$json1" "dump | load | dump produces same result as dump"
 
-    is "$(grep -o : <<<"$json1" | wc -l)" \
+    is $(grep -o : <<<"$json1" | wc -l) \
         "$(grep -oE '/[^/	]*' test/dump.data | sort -u | grep -cvE '/[0-9]*$')" \
         "dumped result contains correct number of keys"
 

test/keys.t

@@ -15,14 +15,23 @@ is "$(JSON.get '/files/file 2.txt/type' tree1)" \
 
 file_object=$(JSON.object '/files' tree1)
 
+# XXX Can't get osx and linux to sort these the same. Workaround:
+{
+  if [[ "$(uname)" == Darwin ]]; then
+    expect="file 2.txt"$'\n'"file1.txt"
+  else
+    expect="file1.txt"$'\n'"file 2.txt"
+  fi
+}
+
 keys="$(JSON.keys '/' file_object)"
 is "$keys" \
-    "file1.txt"$'\n'"file 2.txt" \
+    "$expect" \
     "JSON.keys '/'" #'
 
 keys="$(JSON.keys '/files' tree1)"
 is "$keys" \
-    "file1.txt"$'\n'"file 2.txt" \
+    "$expect" \
     "JSON.keys '/files'" #'
 
 keys="$(JSON.keys '/' tree1)"