From c17659f470a0ffcfea7ee139b11a82248ed61173 Mon Sep 17 00:00:00 2001
From: Peter Verthez <Peter.Verthez@advalvas.be>
Date: Sun, 3 Nov 2002 15:25:40 +0000
Subject: [PATCH] Moved file argument to last position.

---
 t/allged.test                |  2 +-
 t/allged_gom.test            |  2 +-
 t/ansel.test                 |  2 +-
 t/ansel_gom.test             |  2 +-
 t/bogus.test                 |  2 +-
 t/dates.test                 |  2 +-
 t/dates_gom.test             |  2 +-
 t/encoding_error.test        |  2 +-
 t/file_not_exist.test        |  2 +-
 t/line_nr.test               |  2 +-
 t/minimal.test               |  2 +-
 t/src/test_gom               | 13 +++++++++----
 t/src/test_script            |  6 +++---
 t/uhlbomcl.test              |  2 +-
 t/uhlbomcl_gom.test          |  2 +-
 t/uhlcl.test                 |  2 +-
 t/uhlcl_gom.test             |  2 +-
 t/ulhbomcl.test              |  2 +-
 t/ulhbomcl_gom.test          |  2 +-
 t/ulhc.test                  |  2 +-
 t/ulhc_gom.test              |  2 +-
 t/ulhcl.test                 |  2 +-
 t/ulhcl_gom.test             |  2 +-
 t/ulhl.test                  |  2 +-
 t/ulhl_gom.test              |  2 +-
 t/ulhlc.test                 |  2 +-
 t/ulhlc_gom.test             |  2 +-
 t/unknown.test               |  2 +-
 t/unknown_ignore_errors.test |  2 +-
 29 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/t/allged.test b/t/allged.test
index f7e57e4..6c16af4 100755
--- 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 c4a29e7..03b2465 100755
--- 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 afbeb17..6b58c4b 100755
--- 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 44204f8..d3fb7d5 100755
--- 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 2bb4110..43d1cbf 100755
--- 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 0a372c2..c2ab030 100755
--- 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 5a15463..f413664 100755
--- 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 a10767a..58f0b2f 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 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 34bb599..941b538 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 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 3388563..786994c 100755
--- 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 2b3e9e8..658b3f8 100755
--- 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 7cfd657..90f4b4b 100755
--- 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 0013922..46804cb 100755
--- 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 fd9cf83..ac9a5f9 100755
--- 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 e06b698..73439b4 100755
--- 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 ca63cad..d64a30c 100755
--- 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 8ec2eff..eb736d0 100755
--- 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 93706f0..84f63be 100755
--- 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 ebbca89..ce3a064 100755
--- 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 42f5075..bf415a1 100755
--- 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 8a02354..bec812d 100755
--- 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 64c68cc..b0e3dc8 100755
--- 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 ea10f07..77e1688 100755
--- 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 b6c0fb7..c9e4e68 100755
--- 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 724e665..5011738 100755
--- 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 fcabbcb..3ecbe1f 100755
--- 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 775ad42..482175e 100755
--- 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 9e7d55a..cfcd4bc 100755
--- 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 8cebc58..760b163 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 unknown_ignore_errors 0
+$srcdir/src/test_script -fn unknown_ignore_errors 0 unknown.ged
-- 
2.30.2