Moved test programs to src subdirectory.

diff --git a/t/Makefile.am b/t/Makefile.am
index 16854ff9333ae5ad0201de502582823a8a166608..fea7cce11680ecd2d671d0dd9c80cddea64ed00a 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -2,32 +2,12 @@
 # $Id$
 # $Name$
 
-SUBDIRS=input
-INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" -I $(srcdir)/../include \
-           -I $(srcdir)/../utf8
-CFLAGS   = -g -O2
+SUBDIRS=src input .
 
-noinst_PROGRAMS = testgedcom pathtest gomtest @EXTRA_PROGS@
-EXTRA_PROGRAMS  = gomtest_static
-
-testgedcom_SOURCES = standalone.c
-testgedcom_LDFLAGS = -L ../gedcom/.libs -lgedcom
-testgedcom_LDADD  = @INTLLIBS@ ../utf8/libutf8.la
-
-pathtest_SOURCES = pathtest.c
-pathtest_LDFLAGS = -L ../gedcom/.libs -lgedcom
-
-gomtest_SOURCES = gomtest.c
-gomtest_LDFLAGS = -L ../gedcom/.libs -L ../gom/.libs -lgedcom_gom -lgedcom
-
-gomtest_static_SOURCES = gomtest.c
-gomtest_static_LDADD = ../gedcom/.libs/libgedcom.a ../gom/.libs/libgedcom_gom.a
 DMALLOC_LOG = dmalloc.log
-
-TEST_SCRIPT=test_script test_gom
 TESTS := $(wildcard $(srcdir)/*.test)
 
-EXTRA_DIST=$(TEST_SCRIPT) $(TESTS)
+EXTRA_DIST=$(TESTS)
 
 all-local:
        @rm -f testgedcom.out $(DMALLOC_LOG)

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

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

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

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

diff --git a/t/bogus.test b/t/bogus.test
index 190fdb0115a3db7b6a8db75c1e848bca46f3c837..0015ebeea5cc316bd29f9248c6e82772d0697f06 100755 (executable)
--- a/t/bogus.test
+++ b/t/bogus.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/test_script -2 -b minimal.ged 0
+$srcdir/src/test_script -2 -b minimal.ged 0

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

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

diff --git a/t/encoding_error.test b/t/encoding_error.test
index 104f8da367ebc353ab520874ba0f58f815f0a605..1fcd756f29bf3e1ea645d37d5ac0ca737abcdb1b 100755 (executable)
--- a/t/encoding_error.test
+++ b/t/encoding_error.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/test_script -2 -fn encoding_error.ged 0
+$srcdir/src/test_script -2 -fn encoding_error.ged 0

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

diff --git a/t/path1.test b/t/path1.test
index 94e7ee9263cd18dda89f2e5c7b2e897ac1629b72..f45db0a1a899b06df9d6fefee148e24e5eaf4f2a 100755 (executable)
--- a/t/path1.test
+++ b/t/path1.test
@@ -3,4 +3,4 @@
 builddir=`pwd`
 export LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH
 unset GCONV_PATH
-$builddir/pathtest
+$builddir/src/pathtest

diff --git a/t/path2.test b/t/path2.test
index 7f55156e890441f8098165bee4d29b6819258ec7..1f9fd237372d42c8feab629ffae57fcaf167b2ae 100755 (executable)
--- a/t/path2.test
+++ b/t/path2.test
@@ -3,4 +3,4 @@
 builddir=`pwd`
 export LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH
 export GCONV_PATH=./ansel
-$builddir/pathtest
+$builddir/src/pathtest

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/t/unknown_ignore_errors.test b/t/unknown_ignore_errors.test
index 52070d1c59fd0d344a2b93236bfa3c84818eef10..4d8309aacd8d89aadbc83aadca37ed81d33ca4cb 100755 (executable)
--- a/t/unknown_ignore_errors.test
+++ b/t/unknown_ignore_errors.test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-$srcdir/test_script -fn unknown.ged 0
+$srcdir/src/test_script -fn unknown.ged 0