X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=t%2FMakefile.am;h=071b1ea87dbaceab46584c9f2e60eaa1b8380747;hb=04988ba5760b68a017ddf88d9834f47c86a8a4fe;hp=44b16445f628e03f54bbbb8e8259bbeddf0961c3;hpb=a1ee3a539fc8a1e4f5a1c39c488723c4a5870a11;p=gedcom-parse.git

diff --git a/t/Makefile.am b/t/Makefile.am
index 44b1644..071b1ea 100644
--- 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 .
 
-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