From: Peter Verthez Date: Sat, 26 Oct 2002 16:02:42 +0000 (+0000) Subject: Restructure output handling. X-Git-Url: https://git.dlugolecki.net.pl/?a=commitdiff_plain;h=85ee9b58ee45dc56b4415b1f53bf6350f65968fa;p=gedcom-parse.git Restructure output handling. --- diff --git a/t/allged.test b/t/allged.test index f480221..f7e57e4 100755 --- a/t/allged.test +++ b/t/allged.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 allged.ged 0 +$srcdir/src/test_script -2 allged.ged allged 0 diff --git a/t/allged_gom.test b/t/allged_gom.test index 9221344..c4a29e7 100755 --- a/t/allged_gom.test +++ b/t/allged_gom.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_gom allged.ged 0 +$srcdir/src/test_gom allged.ged allged_gom 0 diff --git a/t/ansel.test b/t/ansel.test index 9eb2354..afbeb17 100755 --- a/t/ansel.test +++ b/t/ansel.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 ansel.ged 0 +$srcdir/src/test_script -2 ansel.ged ansel 0 diff --git a/t/ansel_gom.test b/t/ansel_gom.test index d7c5d27..44204f8 100755 --- a/t/ansel_gom.test +++ b/t/ansel_gom.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_gom ansel.ged 0 +$srcdir/src/test_gom ansel.ged ansel_gom 0 diff --git a/t/anselconv.test b/t/anselconv.test index be99800..8bfd92c 100755 --- a/t/anselconv.test +++ b/t/anselconv.test @@ -1,5 +1,7 @@ #!/bin/sh +logfile=check.out + # For use outside Makefile if [ -z "$srcdir" ] then @@ -21,19 +23,26 @@ then export PATH fi -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 +echo "======================================================">> $logfile +echo "Performing test 'anselconv'" >> $logfile +echo "Testing conversion from ANSEL to UTF-8" >> $logfile +iconv -f ANSEL -t UTF-8 $srcdir/input/ansel.ged > anselconv_utf8.out +if diff $srcdir/input/anselutf8.ged anselconv_utf8.out >/dev/null 2>> $logfile then - 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 + echo "Output agrees with reference output" >> $logfile + rm anselconv_utf8.out + echo "Testing conversion from UTF-8 to ANSEL" >> $logfile + iconv -f UTF-8 -t ANSEL $srcdir/input/anselutf8.ged > anselconv_ansel.out + if diff $srcdir/input/ansel.ged anselconv_ansel.out >dev/null 2>> $logfile then - : + echo "Output agrees with reference output" >> $logfile + rm anselconv_ansel.out else + echo "Difference with reference output detected!" >> $logfile retval=1 fi else + echo "Difference with reference output detected!" >> $logfile retval=1 fi diff --git a/t/bogus.test b/t/bogus.test index 0015ebe..a474831 100755 --- a/t/bogus.test +++ b/t/bogus.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 -b minimal.ged 0 +$srcdir/src/test_script -2 -b minimal.ged bogus 0 diff --git a/t/dates.test b/t/dates.test index c6c73ee..0a372c2 100755 --- a/t/dates.test +++ b/t/dates.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 dates.ged 0 +$srcdir/src/test_script -2 dates.ged dates 0 diff --git a/t/dates_gom.test b/t/dates_gom.test index 9f7dd0a..5a15463 100755 --- a/t/dates_gom.test +++ b/t/dates_gom.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_gom dates.ged 0 +$srcdir/src/test_gom dates.ged dates_gom 0 diff --git a/t/encoding_error.test b/t/encoding_error.test index 1fcd756..a10767a 100755 --- a/t/encoding_error.test +++ b/t/encoding_error.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 -fn encoding_error.ged 0 +$srcdir/src/test_script -2 -fn encoding_error.ged encoding_error 0 diff --git a/t/file_not_exist.test b/t/file_not_exist.test index 23c253a..4fb7982 100755 --- a/t/file_not_exist.test +++ b/t/file_not_exist.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script file_not_exist.ged 1 +$srcdir/src/test_script file_not_exist.ged file_not_exist 1 diff --git a/t/minimal.test b/t/minimal.test index bd92e20..2b3e9e8 100755 --- a/t/minimal.test +++ b/t/minimal.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 minimal.ged 0 +$srcdir/src/test_script -2 minimal.ged minimal 0 diff --git a/t/uhlbomcl.test b/t/uhlbomcl.test index 69518e9..fd9cf83 100755 --- a/t/uhlbomcl.test +++ b/t/uhlbomcl.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 uhlbomcl.ged 0 +$srcdir/src/test_script -2 uhlbomcl.ged uhlbomcl 0 diff --git a/t/uhlbomcl_gom.test b/t/uhlbomcl_gom.test index 0589722..e06b698 100755 --- a/t/uhlbomcl_gom.test +++ b/t/uhlbomcl_gom.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_gom uhlbomcl.ged 0 +$srcdir/src/test_gom uhlbomcl.ged uhlbomcl_gom 0 diff --git a/t/uhlcl.test b/t/uhlcl.test index cdb73e6..ca63cad 100755 --- a/t/uhlcl.test +++ b/t/uhlcl.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 uhlcl.ged 0 +$srcdir/src/test_script -2 uhlcl.ged uhlcl 0 diff --git a/t/uhlcl_gom.test b/t/uhlcl_gom.test index 1cf1e02..8ec2eff 100755 --- a/t/uhlcl_gom.test +++ b/t/uhlcl_gom.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_gom uhlcl.ged 0 +$srcdir/src/test_gom uhlcl.ged uhlcl_gom 0 diff --git a/t/ulhbomcl.test b/t/ulhbomcl.test index 8188b3a..93706f0 100755 --- a/t/ulhbomcl.test +++ b/t/ulhbomcl.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 ulhbomcl.ged 0 +$srcdir/src/test_script -2 ulhbomcl.ged ulhbomcl 0 diff --git a/t/ulhbomcl_gom.test b/t/ulhbomcl_gom.test index e5ec2fa..ebbca89 100755 --- a/t/ulhbomcl_gom.test +++ b/t/ulhbomcl_gom.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_gom ulhbomcl.ged 0 +$srcdir/src/test_gom ulhbomcl.ged ulhbomcl_gom 0 diff --git a/t/ulhc.test b/t/ulhc.test index f40a1a9..42f5075 100755 --- a/t/ulhc.test +++ b/t/ulhc.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 ulhc.ged 0 +$srcdir/src/test_script -2 ulhc.ged ulhc 0 diff --git a/t/ulhc_gom.test b/t/ulhc_gom.test index 912b2ce..8a02354 100755 --- a/t/ulhc_gom.test +++ b/t/ulhc_gom.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_gom ulhc.ged 0 +$srcdir/src/test_gom ulhc.ged ulhc_gom 0 diff --git a/t/ulhcl.test b/t/ulhcl.test index 1ebee29..64c68cc 100755 --- a/t/ulhcl.test +++ b/t/ulhcl.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 ulhcl.ged 0 +$srcdir/src/test_script -2 ulhcl.ged ulhcl 0 diff --git a/t/ulhcl_gom.test b/t/ulhcl_gom.test index 5d50bd0..ea10f07 100755 --- a/t/ulhcl_gom.test +++ b/t/ulhcl_gom.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_gom ulhcl.ged 0 +$srcdir/src/test_gom ulhcl.ged ulhcl_gom 0 diff --git a/t/ulhl.test b/t/ulhl.test index 6aa1fc0..b6c0fb7 100755 --- a/t/ulhl.test +++ b/t/ulhl.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 ulhl.ged 0 +$srcdir/src/test_script -2 ulhl.ged ulhl 0 diff --git a/t/ulhl_gom.test b/t/ulhl_gom.test index a57d30b..724e665 100755 --- a/t/ulhl_gom.test +++ b/t/ulhl_gom.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_gom ulhl.ged 0 +$srcdir/src/test_gom ulhl.ged ulhl_gom 0 diff --git a/t/ulhlc.test b/t/ulhlc.test index 38ff9e1..fcabbcb 100755 --- a/t/ulhlc.test +++ b/t/ulhlc.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -2 ulhlc.ged 0 +$srcdir/src/test_script -2 ulhlc.ged ulhlc 0 diff --git a/t/ulhlc_gom.test b/t/ulhlc_gom.test index 82c14f7..775ad42 100755 --- a/t/ulhlc_gom.test +++ b/t/ulhlc_gom.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_gom ulhlc.ged 0 +$srcdir/src/test_gom ulhlc.ged ulhlc_gom 0 diff --git a/t/unknown.test b/t/unknown.test index 7fa9302..9e7d55a 100755 --- a/t/unknown.test +++ b/t/unknown.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script unknown.ged 1 +$srcdir/src/test_script unknown.ged unknown 1 diff --git a/t/unknown_ignore_errors.test b/t/unknown_ignore_errors.test index 4d8309a..8cebc58 100755 --- a/t/unknown_ignore_errors.test +++ b/t/unknown_ignore_errors.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_script -fn unknown.ged 0 +$srcdir/src/test_script -fn unknown.ged unknown_ignore_errors 0 diff --git a/t/update_basic.test b/t/update_basic.test index e491bbd..8dd4b05 100755 --- a/t/update_basic.test +++ b/t/update_basic.test @@ -1,3 +1,3 @@ #!/bin/sh -$srcdir/src/test_update 0 +$srcdir/src/test_update update_basic 0