comparison tests/include.sh @ 287:bd6e98b348cf piper-nopiper

Mark this version 1.5pre
author Chris Cannam
date Fri, 02 Dec 2016 10:00:30 +0000
parents af8f6370c7a9
children aca11ce8a637
comparison
equal deleted inserted replaced
286:5ba121f3889e 287:bd6e98b348cf
11 exit 1;; 11 exit 1;;
12 *) 12 *)
13 ;; 13 ;;
14 esac 14 esac
15 15
16 version=1.5 16 version=1.5pre
17 nextversion=1.6 17 nextversion=1.6
18 18
19 testdir=$mypath/.. 19 testdir=$mypath/..
20 r=$testdir/../sonic-annotator 20 r=$testdir/../sonic-annotator
21 21
62 jsoncompare() { 62 jsoncompare() {
63 # The Sonic Annotator version number appears in the JAMS output -- 63 # The Sonic Annotator version number appears in the JAMS output --
64 # filter that out, and also reformat to ignore whitespace differences 64 # filter that out, and also reformat to ignore whitespace differences
65 a="$1" 65 a="$1"
66 b="$2" 66 b="$2"
67 cat "$a" | sed 's/Sonic Annotator v[0-9.]*/Sonic Annotator vXXX/' | json_reformat > "${a}__" 67 cat "$a" | sed 's/Sonic Annotator v[0-9a-z.]*/Sonic Annotator vXXX/' | json_reformat > "${a}__"
68 cat "$b" | sed 's/Sonic Annotator v[0-9.]*/Sonic Annotator vXXX/' | json_reformat > "${b}__" 68 cat "$b" | sed 's/Sonic Annotator v[0-9a-z.]*/Sonic Annotator vXXX/' | json_reformat > "${b}__"
69 cmp -s "${a}__" "${b}__" 69 cmp -s "${a}__" "${b}__"
70 rv=$? 70 rv=$?
71 rm "${a}__" "${b}__" 71 rm "${a}__" "${b}__"
72 return $rv 72 return $rv
73 } 73 }