# HG changeset patch
# User Chris Cannam
# Date 1441124942 -3600
# Node ID 68daabfc4ccc98a5d69d351cec6528b6b41f5342
# Parent  3b7ec45abd1cf484f6eaeb4ca86410d396575bdd
Use iconv instead of uconv (present on OS/X)

diff -r 3b7ec45abd1c -r 68daabfc4ccc tests/test-rdf-writer/test-rdf-writer.sh
--- 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
diff -r 3b7ec45abd1c -r 68daabfc4ccc tests/test-supportprogs/test-supportprogs.sh
--- 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 || \