For ICU testing, pass -o to yaz-icu

this will test the icu_iter_get_org_info function.

diff --git a/test/test_icu.0.output b/test/test_icu.0.output
index 2a9dc2e..ba0c37c 100644 (file)
--- a/test/test_icu.0.output
+++ b/test/test_icu.0.output
@@ -1,7 +1,7 @@
-1 1 'børn' 'Børn'
-2 2 'le' 'Le'
-3 2 'carré' 'Carré'
-4 3 'le' 'Le'
-5 3 'carre' 'Carre'
-6 4 'le' 'Le'
-7 4 'carré' 'Carré'
+1 1 'børn' 'Børn' 0+5
+2 2 'le' 'Le' 0+3
+3 2 'carré' 'Carré' 3+6
+4 3 'le' 'Le' 0+3
+5 3 'carre' 'Carre' 3+5
+6 4 'le' 'Le' 0+3
+7 4 'carré' 'Carré' 3+7

diff --git a/test/test_icu.1.output b/test/test_icu.1.output
index 78b2967..ba8e613 100644 (file)
--- a/test/test_icu.1.output
+++ b/test/test_icu.1.output
@@ -1,7 +1,7 @@
-1 1 'børn' 'Børn'
-2 2 'le' 'Le'
-3 2 'carre' 'Carre'
-4 3 'le' 'Le'
-5 3 'carre' 'Carre'
-6 4 'le' 'Le'
-7 4 'carre' 'Carre'
+1 1 'børn' 'Børn' 0+5
+2 2 'le' 'Le' 0+3
+3 2 'carre' 'Carre' 3+6
+4 3 'le' 'Le' 0+3
+5 3 'carre' 'Carre' 3+5
+6 4 'le' 'Le' 0+3
+7 4 'carre' 'Carre' 3+7

diff --git a/test/test_icu.2.output b/test/test_icu.2.output
index b5ee584..d8bf7c6 100644 (file)
--- a/test/test_icu.2.output
+++ b/test/test_icu.2.output
@@ -1,4 +1,4 @@
 1 1 '‘a'
 1 1 '‘a'

-' ''
+' '' 0+4

 2 2 '“a''
 2 2 '“a''

-' ''
+' '' 0+6

diff --git a/test/test_icu.3.output b/test/test_icu.3.output
index 3139c0b..3fe68cc 100644 (file)
--- a/test/test_icu.3.output
+++ b/test/test_icu.3.output
@@ -1,4 +1,4 @@
-1 1 'men' ''
-2 1 'run' ''
-3 2 'he' ''
-4 2 'run' ''
+1 1 'men' '' 0+4
+2 1 'run' '' 4+7
+3 2 'he' '' 0+3
+4 2 'run' '' 3+5

diff --git a/test/test_icu.4.output b/test/test_icu.4.output
index f24f967..5bbdaed 100644 (file)
--- a/test/test_icu.4.output
+++ b/test/test_icu.4.output
@@ -1 +1 @@
-1 1 'Andersen, H.C' ''
+1 1 'Andersen, H.C' '' 0+15

diff --git a/test/test_icu.sh b/test/test_icu.sh
index 06b50f9..9b81e1f 100755 (executable)
--- a/test/test_icu.sh
+++ b/test/test_icu.sh
@@ -19,7 +19,7 @@ for f in ${srcdir}/test_icu.[0-9].input; do
     NEW=${fb}.output.tmp
     OLD=${srcdir}/${fb}.output
     DIFF=`basename ${fb}`.diff
     NEW=${fb}.output.tmp
     OLD=${srcdir}/${fb}.output
     DIFF=`basename ${fb}`.diff

-    ../util/yaz-icu -c $CONFIG <$f > $NEW
+    ../util/yaz-icu -o -c $CONFIG <$f > $NEW

     if test $? != "0"; then
        echo "$f: yaz-icu returned error"
        ecode=1
     if test $? != "0"; then
        echo "$f: yaz-icu returned error"
        ecode=1