X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=t%2Fanselconv.test;h=be99800edc53705bcc412468d41989cc0b380c7c;hb=f14e8bb4d49f22970f7f4c4cbc5173faada5d083;hp=f0e3876159f683551bd4690849c59cf63549f7f0;hpb=04988ba5760b68a017ddf88d9834f47c86a8a4fe;p=gedcom-parse.git

diff --git a/t/anselconv.test b/t/anselconv.test
index f0e3876..be99800 100755
--- a/t/anselconv.test
+++ b/t/anselconv.test
@@ -7,7 +7,8 @@ then
 fi
 builddir=`pwd`
 
-export GCONV_PATH=.:$GCONV_PATH
+GCONV_PATH=.:$GCONV_PATH
+export GCONV_PATH
 ln -s $srcdir/../data/gedcom.enc .
 ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so .
 ln -s $srcdir/../iconv/glibc/gconv-modules .
@@ -16,19 +17,24 @@ retval=0
 
 if [ "$ICONV_PATH" ]
 then
-  export PATH=$ICONV_PATH:$PATH
+  PATH=$ICONV_PATH:$PATH
+  export PATH
 fi
 
-iconv --from-code=ANSEL --to-code=UTF-8 input/ansel.ged -o anselutf8.out
-if ! diff input/anselutf8.ged anselutf8.out
+echo "Testing conversion from ANSEL to UTF-8" >> testgedcom.out
+iconv -f ANSEL -t UTF-8 $srcdir/input/ansel.ged > anselutf8.out
+if diff $srcdir/input/anselutf8.ged anselutf8.out >> testgedcom.out
 then
-  retval=1
-else
-  iconv --to-code=ANSEL --from-code=UTF-8 input/anselutf8.ged -o ansel.out
-  if ! diff input/ansel.ged ansel.out
+  echo "Testing conversion from UTF-8 to ANSEL" >> testgedcom.out
+  iconv -f UTF-8 -t ANSEL $srcdir/input/anselutf8.ged > ansel.out
+  if diff $srcdir/input/ansel.ged ansel.out >> testgedcom.out
   then
+    :
+  else
     retval=1
   fi
+else
+  retval=1
 fi
 
 rm gedcom.enc