Mercurial > hg > sonic-annotator
changeset 198:68daabfc4ccc
Use iconv instead of uconv (present on OS/X)
| author | Chris Cannam |
|---|---|
| date | Tue, 01 Sep 2015 17:29:02 +0100 |
| parents | 3b7ec45abd1c |
| children | c8b934ed4ddd |
| files | tests/test-rdf-writer/test-rdf-writer.sh tests/test-supportprogs/test-supportprogs.sh |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rdf-writer/test-rdf-writer.sh Tue Sep 01 17:05:32 2015 +0100 +++ b/tests/test-rdf-writer/test-rdf-writer.sh Tue Sep 01 17:29:02 2015 +0100 @@ -66,8 +66,8 @@ # Check the output encoding -- should be valid UTF-8 always for code in ucs-2 iso-8859-1; do - $r -t $transformdir/onsets.n3 -w rdf --rdf-stdout $audiopath/id3v2-$code.mp3 2>/dev/null | uconv --from-code utf-8 --to-code utf-8 --from-callback stop >/dev/null || - fail "RDF/Turtle output from $code input is not valid utf-8 according to uconv" + $r -t $transformdir/onsets.n3 -w rdf --rdf-stdout $audiopath/id3v2-$code.mp3 2>/dev/null | iconv --from-code=utf-8 --to-code=utf-8 >/dev/null || + fail "RDF/Turtle output from $code input is not valid utf-8 according to iconv" done exit 0
--- a/tests/test-supportprogs/test-supportprogs.sh Tue Sep 01 17:05:32 2015 +0100 +++ b/tests/test-supportprogs/test-supportprogs.sh Tue Sep 01 17:29:02 2015 +0100 @@ -11,7 +11,7 @@ rapper --version >/dev/null || \ fail "Can't find required rapper program" -uconv --version >/dev/null || \ +iconv --version >/dev/null || \ fail "Can't find required uconv program" echo '{}' | json_verify >/dev/null || \