X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=t%2FMakefile.am;h=6e2fb3e1bb0bb1165b17abe5f23511d87cdf3f09;hb=0ed444394c30a2e3983fb551e7f788804116a8b4;hp=fea7cce11680ecd2d671d0dd9c80cddea64ed00a;hpb=3780b0be94bdb523584290763077582147ea57ce;p=gedcom-parse.git

diff --git a/t/Makefile.am b/t/Makefile.am
index fea7cce..6e2fb3e 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -2,34 +2,21 @@
 # $Id$
 # $Name$
 
-SUBDIRS=src input .
+SUBDIRS=src input output .
 
-DMALLOC_LOG = dmalloc.log
 TESTS := $(wildcard $(srcdir)/*.test)
 
-EXTRA_DIST=$(TESTS)
+EXTRA_DIST=$(TESTS) set_testenv
+
+TESTS_ENVIRONMENT=ICONV_PATH=@ICONV_PATH@
 
 all-local:
-	@rm -f testgedcom.out $(DMALLOC_LOG)
+	@rm -f *.out *.ged
 
-check-% :	%.test all-local
+check-% :	%.test all
 	@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
-