Moved file argument to last position.

diff --git a/t/allged.test b/t/allged.test
index f7e57e4e368493e9b31a3a9d4089648729236f94..6c16af490a0894413bf4cf1440c7cb1f78fb066a 100755 (executable)
--- a/t/allged.test
+++ b/t/allged.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script -2 allged.ged allged 0
+$srcdir/src/test_script -2 allged 0 allged.ged

diff --git a/t/allged_gom.test b/t/allged_gom.test
index c4a29e7943c98430f4decfd055fe0f59be3cc92f..03b24655ac7dc2976373a22ec7570ff3498773d3 100755 (executable)
--- a/t/allged_gom.test
+++ b/t/allged_gom.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_gom allged.ged allged_gom 0
+$srcdir/src/test_gom allged_gom 0 allged.ged

diff --git a/t/ansel.test b/t/ansel.test
index afbeb17aa0d399f9022e90b36e35ee9c46d97d95..6b58c4bcb82ae8290e72aa6291518a3bd97ce83d 100755 (executable)
--- a/t/ansel.test
+++ b/t/ansel.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script -2 ansel.ged ansel 0
+$srcdir/src/test_script -2 ansel 0 ansel.ged

diff --git a/t/ansel_gom.test b/t/ansel_gom.test
index 44204f8ae79d9b378f2aa782302690993a50d0ee..d3fb7d5ca536d12a36127135e9f8b148e2f6af84 100755 (executable)
--- a/t/ansel_gom.test
+++ b/t/ansel_gom.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_gom ansel.ged ansel_gom 0
+$srcdir/src/test_gom ansel_gom 0 ansel.ged

diff --git a/t/bogus.test b/t/bogus.test
index 2bb4110a254150d1f5e0621e1481b0ec1adc277d..43d1cbffa0fec139362ab37c9a986d81caf7360e 100755 (executable)
--- a/t/bogus.test
+++ b/t/bogus.test
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cp $srcdir/input/bogus.ged bogus.ged
-$srcdir/src/test_script -2 -b minimal.ged bogus 0
+$srcdir/src/test_script -2 -b bogus 0 minimal.ged
 result=$?
 rm bogus.ged
 exit $result

diff --git a/t/dates.test b/t/dates.test
index 0a372c279f58f4411bd9d966a8ef34c8c2b060b0..c2ab03052ea0e6c04c5ff4e5e1e3cf615457920f 100755 (executable)
--- a/t/dates.test
+++ b/t/dates.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script -2 dates.ged dates 0
+$srcdir/src/test_script -2 dates 0 dates.ged

diff --git a/t/dates_gom.test b/t/dates_gom.test
index 5a1546392df2fa4758d827776fe268aaba2927d3..f4136640d2d35cf84af5ff2a6de34167b1dd6c5f 100755 (executable)
--- a/t/dates_gom.test
+++ b/t/dates_gom.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_gom dates.ged dates_gom 0
+$srcdir/src/test_gom dates_gom 0 dates.ged

diff --git a/t/encoding_error.test b/t/encoding_error.test
index a10767a121c49b8a4bd092968b124fe2f23cff4b..58f0b2f98c5065b4d8c5982316d17de9e12d2c32 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 encoding_error 0
+$srcdir/src/test_script -2 -fn encoding_error 0 encoding_error.ged

diff --git a/t/file_not_exist.test b/t/file_not_exist.test
index 34bb59996e4d7273a3ca7763597bdc0fe347ae1f..941b5386861aa23898f40e477d01048f304f998e 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 file_not_exist 1
+$srcdir/src/test_script file_not_exist 1 ./file_not_exist.ged

diff --git a/t/line_nr.test b/t/line_nr.test
index 33885635b28e21c0140482280b518a2a6ab36532..786994c257f94558a2bf8565f9f4abc2a4b4dafd 100755 (executable)
--- a/t/line_nr.test
+++ b/t/line_nr.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script -2 line_nr.ged line_nr 1
+$srcdir/src/test_script -2 line_nr 1 line_nr.ged

diff --git a/t/minimal.test b/t/minimal.test
index 2b3e9e816388ff1092f806f49d3e7e45d8286f59..658b3f8999b943be517817fe0051dcd0a5e74bd2 100755 (executable)
--- a/t/minimal.test
+++ b/t/minimal.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script -2 minimal.ged minimal 0
+$srcdir/src/test_script -2 minimal 0 minimal.ged

diff --git a/t/src/test_gom b/t/src/test_gom
index 7cfd657c893d723105c96c262fa9ec80809c2233..90f4b4bfdb26cf5435935cf1ce182b21f3242fca 100755 (executable)
--- a/t/src/test_gom
+++ b/t/src/test_gom
@@ -14,9 +14,9 @@ do
   shift
 done
 
-file=$1
-test_name=$2
-expected_result=$3
+test_name=$1
+expected_result=$2
+file=$3
 if [ -z "$test_name" ]
 then
   test_name=check
@@ -33,7 +33,10 @@ then
   srcdir=.
   options=$extra_options
 else
-  testfile=$srcdir/input/$file
+  case $file in
+    ./*) testfile=$file ;;
+    *)   testfile=$srcdir/input/$file ;;
+  esac
   options="$options $extra_options"
 fi
 
@@ -46,6 +49,8 @@ builddir=`pwd`
 ltcmd="$builddir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la -dlopen $builddir/../gom/libgedcom_gom.la"
 GCONV_PATH=.:$GCONV_PATH
 export GCONV_PATH
+LANG=C
+export LANG
 ln -s $srcdir/../data/gedcom.enc .
 ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so .
 ln -s $srcdir/../iconv/glibc/gconv-modules .

diff --git a/t/src/test_script b/t/src/test_script
index 00139226d038140cc18ee386e11330447f1125ad..46804cb03a867b66e717dd6bdbf25175ed1b95b4 100755 (executable)
--- a/t/src/test_script
+++ b/t/src/test_script
@@ -14,9 +14,9 @@ do
   shift
 done
 
-file=$1
-test_name=$2
-expected_result=$3
+test_name=$1
+expected_result=$2
+file=$3
 if [ -z "$test_name" ]
 then
   test_name=check

diff --git a/t/uhlbomcl.test b/t/uhlbomcl.test
index fd9cf838b6138cd74b697b57669d36d3a9729714..ac9a5f96208de8b7e749219ab5eed4862a76dbcd 100755 (executable)
--- a/t/uhlbomcl.test
+++ b/t/uhlbomcl.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script -2 uhlbomcl.ged uhlbomcl 0
+$srcdir/src/test_script -2 uhlbomcl 0 uhlbomcl.ged

diff --git a/t/uhlbomcl_gom.test b/t/uhlbomcl_gom.test
index e06b698606e87ccc760391e60b727a99751bc15f..73439b4927567c8f30a455b411be30ccce0ecf10 100755 (executable)
--- a/t/uhlbomcl_gom.test
+++ b/t/uhlbomcl_gom.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_gom uhlbomcl.ged uhlbomcl_gom 0
+$srcdir/src/test_gom uhlbomcl_gom 0 uhlbomcl.ged

diff --git a/t/uhlcl.test b/t/uhlcl.test
index ca63cada49de2c63cd623dfe5e30c2e0849c47af..d64a30c825d021c6c8ba5b3304de2e2830b17e0c 100755 (executable)
--- a/t/uhlcl.test
+++ b/t/uhlcl.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script -2 uhlcl.ged uhlcl 0
+$srcdir/src/test_script -2 uhlcl 0 uhlcl.ged

diff --git a/t/uhlcl_gom.test b/t/uhlcl_gom.test
index 8ec2eff557f622d6294aa4e4ad415d8f74245055..eb736d0f643789e3ace6281367770056c79499cc 100755 (executable)
--- a/t/uhlcl_gom.test
+++ b/t/uhlcl_gom.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_gom uhlcl.ged uhlcl_gom 0
+$srcdir/src/test_gom uhlcl_gom 0 uhlcl.ged

diff --git a/t/ulhbomcl.test b/t/ulhbomcl.test
index 93706f0de5e3bbc34c8bfd3ea7b382b0581e539d..84f63be6f5d409f383bf35098b79b70744896f5b 100755 (executable)
--- a/t/ulhbomcl.test
+++ b/t/ulhbomcl.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script -2 ulhbomcl.ged ulhbomcl 0
+$srcdir/src/test_script -2 ulhbomcl 0 ulhbomcl.ged

diff --git a/t/ulhbomcl_gom.test b/t/ulhbomcl_gom.test
index ebbca897e4f8f1cdf70cf04538152483fa3eeafb..ce3a064743c6739a95e033f2aeb8b7673dfee675 100755 (executable)
--- a/t/ulhbomcl_gom.test
+++ b/t/ulhbomcl_gom.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_gom ulhbomcl.ged ulhbomcl_gom 0
+$srcdir/src/test_gom ulhbomcl_gom 0 ulhbomcl.ged

diff --git a/t/ulhc.test b/t/ulhc.test
index 42f507543f740fdb0eac61f6843763b70698f793..bf415a1808da93268c83a3184a28005b7d7f4354 100755 (executable)
--- a/t/ulhc.test
+++ b/t/ulhc.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script -2 ulhc.ged ulhc 0
+$srcdir/src/test_script -2 ulhc 0 ulhc.ged

diff --git a/t/ulhc_gom.test b/t/ulhc_gom.test
index 8a02354d43a4ce6ea036c9c1fab786db0c1074d2..bec812d412e6857c7738636b3fa900a75fee8ac3 100755 (executable)
--- a/t/ulhc_gom.test
+++ b/t/ulhc_gom.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_gom ulhc.ged ulhc_gom 0
+$srcdir/src/test_gom ulhc_gom 0 ulhc.ged

diff --git a/t/ulhcl.test b/t/ulhcl.test
index 64c68cc4ed226bb53efa3c06eef63dd686a97a42..b0e3dc8eb2780d615e513d0e73b3f49574f1ef6b 100755 (executable)
--- a/t/ulhcl.test
+++ b/t/ulhcl.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script -2 ulhcl.ged ulhcl 0
+$srcdir/src/test_script -2 ulhcl 0 ulhcl.ged

diff --git a/t/ulhcl_gom.test b/t/ulhcl_gom.test
index ea10f07b89286ab654538797a00a9c37b18ab67c..77e16885d1b2f952622162528a260278bacf7638 100755 (executable)
--- a/t/ulhcl_gom.test
+++ b/t/ulhcl_gom.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_gom ulhcl.ged ulhcl_gom 0
+$srcdir/src/test_gom ulhcl_gom 0 ulhcl.ged

diff --git a/t/ulhl.test b/t/ulhl.test
index b6c0fb7995eaf2acb04ab57dec2a2150c629694d..c9e4e683b3fe7558bb51fd91daf191d65081e2ce 100755 (executable)
--- a/t/ulhl.test
+++ b/t/ulhl.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script -2 ulhl.ged ulhl 0
+$srcdir/src/test_script -2 ulhl 0 ulhl.ged

diff --git a/t/ulhl_gom.test b/t/ulhl_gom.test
index 724e66505836b96ee7eb4db637d53f072c047545..50117385e44aa5ee448ecb1b6a34c12f8fc11d03 100755 (executable)
--- a/t/ulhl_gom.test
+++ b/t/ulhl_gom.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_gom ulhl.ged ulhl_gom 0
+$srcdir/src/test_gom ulhl_gom 0 ulhl.ged

diff --git a/t/ulhlc.test b/t/ulhlc.test
index fcabbcb6dc5e9d41928db8d9f64822281dbaa3da..3ecbe1fd271d1b6ded381e00a8221e35bd2b5e0d 100755 (executable)
--- a/t/ulhlc.test
+++ b/t/ulhlc.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script -2 ulhlc.ged ulhlc 0
+$srcdir/src/test_script -2 ulhlc 0 ulhlc.ged

diff --git a/t/ulhlc_gom.test b/t/ulhlc_gom.test
index 775ad420502ee8085278397327b4b32ebbbe1056..482175e75fb31c80446deacc0a2bda893735a885 100755 (executable)
--- a/t/ulhlc_gom.test
+++ b/t/ulhlc_gom.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_gom ulhlc.ged ulhlc_gom 0
+$srcdir/src/test_gom ulhlc_gom 0 ulhlc.ged

diff --git a/t/unknown.test b/t/unknown.test
index 9e7d55af3db4967e22cbedc2de3cff63928192bc..cfcd4bc7def786bf56025a8cfa68ece7c935c8ac 100755 (executable)
--- a/t/unknown.test
+++ b/t/unknown.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/src/test_script unknown.ged unknown 1
+$srcdir/src/test_script unknown 1 unknown.ged

diff --git a/t/unknown_ignore_errors.test b/t/unknown_ignore_errors.test
index 8cebc58e2ba94917c7057e64855ea3cbef1ebcb4..760b16311c0fffc7ceb9a0052d55079b0ef3a772 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 unknown_ignore_errors 0
+$srcdir/src/test_script -fn unknown_ignore_errors 0 unknown.ged