# HG changeset patch
# User Chris Cannam
# Date 1448276179 0
# Node ID b1ac129e2c00a690f2ad57439c79ae54c7e42123
# Parent  20bf837f53ab1e19c57fff249c6de3198bf96ed1
Update version number in tests, and also disregard version number mismatches in JAMS output (as they're inevitable)

diff -r 20bf837f53ab -r b1ac129e2c00 tests/include.sh
--- a/tests/include.sh	Fri Nov 20 09:32:26 2015 +0000
+++ b/tests/include.sh	Mon Nov 23 10:56:19 2015 +0000
@@ -13,8 +13,8 @@
     ;;
 esac
 
-version=1.3
-nextversion=1.4
+version=1.4
+nextversion=1.5
 
 testdir=$mypath/..
 r=$testdir/../sonic-annotator
@@ -60,11 +60,13 @@
 }
 
 jsoncompare() {
+    # The Sonic Annotator version number appears in the JAMS output --
+    # filter that out, and also reformat to ignore whitespace differences
     a="$1"
     b="$2"
-    cat "$a" | json_reformat > "${a}__"
-    cat "$b" | json_reformat > "${b}__"
-    cmp -s "$a" "$b"
+    cat "$a" | sed 's/Sonic Annotator v[0-9.]*/Sonic Annotator vXXX/' | json_reformat > "${a}__"
+    cat "$b" | sed 's/Sonic Annotator v[0-9.]*/Sonic Annotator vXXX/' | json_reformat > "${b}__"
+    cmp -s "${a}__" "${b}__"
     rv=$?
     rm "${a}__" "${b}__"
     return $rv