Restructure output handling.

diff --git a/t/allged.test b/t/allged.test
index f48022102bd1ac7e168cf244d2a32bf568b2025e..f7e57e4e368493e9b31a3a9d4089648729236f94 100755 (executable)
--- 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 922134416933a269d3a390fa6161af8eb639cafb..c4a29e7943c98430f4decfd055fe0f59be3cc92f 100755 (executable)
--- 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 9eb235496d7437c98a20523238ae35980bf98af0..afbeb17aa0d399f9022e90b36e35ee9c46d97d95 100755 (executable)
--- 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 d7c5d2757ce7b83d2db0620b7c1590841f43ab66..44204f8ae79d9b378f2aa782302690993a50d0ee 100755 (executable)
--- 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 be99800edc53705bcc412468d41989cc0b380c7c..8bfd92cf71d92520b63471f3c27b62eb02b772d7 100755 (executable)
--- 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 0015ebeea5cc316bd29f9248c6e82772d0697f06..a474831b9afd161b14588726b3ff3e76d7f33daf 100755 (executable)
--- 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 c6c73eec3036f4974936ee150af467098f96d43d..0a372c279f58f4411bd9d966a8ef34c8c2b060b0 100755 (executable)
--- 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 9f7dd0ae95bea84f2b25dc04659ffc925d9435eb..5a1546392df2fa4758d827776fe268aaba2927d3 100755 (executable)
--- 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 1fcd756f29bf3e1ea645d37d5ac0ca737abcdb1b..a10767a121c49b8a4bd092968b124fe2f23cff4b 100755 (executable)
--- 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 23c253a97f6884ab129c0c5f564e1b235c9c6ad2..4fb7982dad134fd663c03a2974a159e474b57ae5 100755 (executable)
--- 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 bd92e201d2edd9815db7ff0d801718b782e51000..2b3e9e816388ff1092f806f49d3e7e45d8286f59 100755 (executable)
--- 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 69518e967a34741c0a4609b855af8a97dcad2dbe..fd9cf838b6138cd74b697b57669d36d3a9729714 100755 (executable)
--- 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 0589722f6f58e86b58f3123c13d4a234d9e9c56d..e06b698606e87ccc760391e60b727a99751bc15f 100755 (executable)
--- 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 cdb73e63ff6f5703cb95bbfca4c6a0f02c8c7d8e..ca63cada49de2c63cd623dfe5e30c2e0849c47af 100755 (executable)
--- 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 1cf1e027c2fc952b983cbfb40c00d33ce0c8d984..8ec2eff557f622d6294aa4e4ad415d8f74245055 100755 (executable)
--- 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 8188b3acb86c44e278952c43f4a4e11b95bf4396..93706f0de5e3bbc34c8bfd3ea7b382b0581e539d 100755 (executable)
--- 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 e5ec2faf5adde78511a2a00779faff531bff5af2..ebbca897e4f8f1cdf70cf04538152483fa3eeafb 100755 (executable)
--- 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 f40a1a96ed055f82c61e44890c958ef6a51cbd70..42f507543f740fdb0eac61f6843763b70698f793 100755 (executable)
--- 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 912b2ce650cf989d1960ed295f1e14709c733459..8a02354d43a4ce6ea036c9c1fab786db0c1074d2 100755 (executable)
--- 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 1ebee291435e3f9b0f03fef9197896f09b234a8a..64c68cc4ed226bb53efa3c06eef63dd686a97a42 100755 (executable)
--- 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 5d50bd0134fef520bff7b4f6e9075e6411dd1520..ea10f07b89286ab654538797a00a9c37b18ab67c 100755 (executable)
--- 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 6aa1fc0314b23ec99eddcfe79f28c2a5e6e11a01..b6c0fb7995eaf2acb04ab57dec2a2150c629694d 100755 (executable)
--- 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 a57d30b1253311ff750b68714c3101488b8dadbe..724e66505836b96ee7eb4db637d53f072c047545 100755 (executable)
--- 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 38ff9e11b86e6e360b05439ffd6eb1d27d5ceb1a..fcabbcb6dc5e9d41928db8d9f64822281dbaa3da 100755 (executable)
--- 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 82c14f7fd983b7d81106b4be630367438a7e5a40..775ad420502ee8085278397327b4b32ebbbe1056 100755 (executable)
--- 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 7fa93020cb9d7053c7afd879e83e5c57092bdb20..9e7d55af3db4967e22cbedc2de3cff63928192bc 100755 (executable)
--- 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 4d8309aacd8d89aadbc83aadca37ed81d33ca4cb..8cebc58e2ba94917c7057e64855ea3cbef1ebcb4 100755 (executable)
--- 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 e491bbddf1b8bb6994d079b9cd937b99e2200661..8dd4b05cbfdf1342d132b4f9f7292179a16c3b7d 100755 (executable)
--- 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