From a1ee3a539fc8a1e4f5a1c39c488723c4a5870a11 Mon Sep 17 00:00:00 2001 From: Peter Verthez Date: Sun, 17 Mar 2002 13:45:21 +0000 Subject: [PATCH] Move of test programs to t subdirectory. --- Makefile.am | 8 -------- configure.in | 2 +- t/Makefile.am | 12 ++++++++++++ t/test_script | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index fd2524a..f8c7be9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,16 +2,8 @@ # $Id$ # $Name$ SUBDIRS = intl ansel gedcom include . t doc po -INCLUDES = -I $(srcdir)/include -CFLAGS = -g -O2 pkgdata_DATA = gedcom.enc -noinst_PROGRAMS = testgedcom - -testgedcom_SOURCES = standalone.c utf8-locale.c -noinst_HEADERS = utf8-locale.h -testgedcom_LDFLAGS = -L gedcom/.libs -lgedcom -testgedcom_LDADD = @INTLLIBS@ EXTRA_DIST = $(pkgdata_DATA) Makefile.inc VERSIONED_FILES = README diff --git a/configure.in b/configure.in index e3a97b0..6a1850e 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. # $Id$ # $Name$ -AC_INIT(standalone.c) +AC_INIT(gedcom.enc) dnl ============================================================= dnl Global variables diff --git a/t/Makefile.am b/t/Makefile.am index 2d88839..44b1644 100644 --- a/t/Makefile.am +++ b/t/Makefile.am @@ -3,6 +3,18 @@ # $Name$ SUBDIRS=input +INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" -I $(srcdir)/../include +CFLAGS = -g -O2 + +noinst_PROGRAMS = testgedcom pathtest + +testgedcom_SOURCES = standalone.c utf8-locale.c +noinst_HEADERS = utf8-locale.h +testgedcom_LDFLAGS = -L ../gedcom/.libs -lgedcom +testgedcom_LDADD = @INTLLIBS@ + +pathtest_SOURCES = pathtest.c +pathtest_LDFLAGS = -L ../gedcom/.libs -lgedcom TEST_SCRIPT=test_script TESTS := $(wildcard $(srcdir)/*.test) diff --git a/t/test_script b/t/test_script index cd943a3..ed62f9b 100755 --- a/t/test_script +++ b/t/test_script @@ -25,7 +25,7 @@ cd $srcdir/.. export GCONV_PATH=./ansel:$GCONV_PATH export LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH cp $builddir/../ansel/.libs/ANSI_Z39.47.so ansel -$builddir/../testgedcom $options t/input/$file +$builddir/testgedcom $options t/input/$file result=$? rm ansel/ANSI_Z39.47.so if [ "$result" -eq "$expected_result" ] -- 2.30.2