Restructure output from tests.

[gedcom-parse.git] / t / Makefile.am

diff --git a/t/Makefile.am b/t/Makefile.am
index 44b16445f628e03f54bbbb8e8259bbeddf0961c3..0182fcc15f2ef6047543c37de1a0bd2300e3b9b9 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -2,24 +2,36 @@
 # $Id$
 # $Name$
 
-SUBDIRS=input
-INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" -I $(srcdir)/../include
-CFLAGS   = -g -O2
+SUBDIRS=src input output .
 
-noinst_PROGRAMS = testgedcom pathtest
+DMALLOC_LOG = dmalloc.log
+TESTS := $(wildcard $(srcdir)/*.test)
 
-testgedcom_SOURCES = standalone.c utf8-locale.c
-noinst_HEADERS     = utf8-locale.h
-testgedcom_LDFLAGS = -L ../gedcom/.libs -lgedcom
-testgedcom_LDADD  = @INTLLIBS@
+EXTRA_DIST=$(TESTS)
 
-pathtest_SOURCES = pathtest.c
-pathtest_LDFLAGS = -L ../gedcom/.libs -lgedcom
+TESTS_ENVIRONMENT=ICONV_PATH=@ICONV_PATH@
 
-TEST_SCRIPT=test_script
-TESTS := $(wildcard $(srcdir)/*.test)
+all-local:
+       @rm -f *.out $(DMALLOC_LOG)
 
-EXTRA_DIST=$(TEST_SCRIPT) $(TESTS)
+check-% :      %.test all-local
+       @srcdir=$(srcdir); export srcdir; \
+        if $(TESTS_ENVIRONMENT) ./$<; then \
+         echo "Test succeeded"; \
+       else \
+         echo "Test failed"; \
+       fi
+
+check-dmalloc-%:       %.test all-local
+       @if [ "@EXTRA_PROGS@" = "" ]; then \
+         echo "Please run './configure --with-dmalloc' first"; \
+         exit; \
+       fi; \
+       srcdir=$(srcdir); export srcdir; \
+       GOM_DMALLOC_TEST=$(DMALLOC_LOG); export GOM_DMALLOC_TEST; \
+        if $(TESTS_ENVIRONMENT) ./$<; then \
+         echo "Test succeeded"; \
+       else \
+         echo "Test failed"; \
+       fi
 
-all-local:
-       rm -f ../testgedcom.out