Directory output added.

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

diff --git a/t/Makefile.am b/t/Makefile.am
index 2d88839cf327fa85a5cf9a48ca4ba23498309ba0..0182fcc15f2ef6047543c37de1a0bd2300e3b9b9 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -2,12 +2,36 @@
 # $Id$
 # $Name$
 
-SUBDIRS=input
+SUBDIRS=src input output .
 
-TEST_SCRIPT=test_script
+DMALLOC_LOG = dmalloc.log
 TESTS := $(wildcard $(srcdir)/*.test)
 
-EXTRA_DIST=$(TEST_SCRIPT) $(TESTS)
+EXTRA_DIST=$(TESTS)
+
+TESTS_ENVIRONMENT=ICONV_PATH=@ICONV_PATH@
 
 all-local:
-       rm -f ../testgedcom.out
+       @rm -f *.out $(DMALLOC_LOG)
+
+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
+