From: Peter Verthez Date: Sun, 3 Nov 2002 12:48:34 +0000 (+0000) Subject: Removed support for testing with dmalloc (valgrind is better...). X-Git-Url: https://git.dlugolecki.net.pl/?a=commitdiff_plain;h=a5bd4c3c89f5cb433a615c436947b8b0f44c3661;p=gedcom-parse.git Removed support for testing with dmalloc (valgrind is better...). --- diff --git a/configure.in b/configure.in index 82e16b7..fbb85ec 100644 --- a/configure.in +++ b/configure.in @@ -58,13 +58,6 @@ fi dnl ============================================================= dnl Checks for libraries. AM_GNU_GETTEXT([use-libtool],[need-ngettext]) -AM_WITH_DMALLOC - -dnl == Make statically linked test program for dmalloc tests -if test "$with_dmalloc" = "yes"; then - EXTRA_PROGS=gomtest_static -fi -AC_SUBST(EXTRA_PROGS) dnl ============================================================= dnl Checks for typedefs, structures, and compiler characteristics. diff --git a/gedcom/gedcom_internal.h b/gedcom/gedcom_internal.h index 9807ecb..9947c9b 100644 --- a/gedcom/gedcom_internal.h +++ b/gedcom/gedcom_internal.h @@ -32,9 +32,6 @@ #include #endif #include -#ifdef WITH_DMALLOC -#include -#endif #define _(string) gettext(string) #define N_(string) (string) diff --git a/gom/gom_internal.h b/gom/gom_internal.h index 86e34ab..0ef609b 100644 --- a/gom/gom_internal.h +++ b/gom/gom_internal.h @@ -29,9 +29,6 @@ #include #include "gom.h" #include "gedcom.h" -#ifdef WITH_DMALLOC -#include -#endif #define _(string) gettext(string) #define N_(string) (string) diff --git a/t/Makefile.am b/t/Makefile.am index 0182fcc..a95ff70 100644 --- a/t/Makefile.am +++ b/t/Makefile.am @@ -4,7 +4,6 @@ SUBDIRS=src input output . -DMALLOC_LOG = dmalloc.log TESTS := $(wildcard $(srcdir)/*.test) EXTRA_DIST=$(TESTS) @@ -21,17 +20,3 @@ check-% : %.test all-local 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 - diff --git a/t/src/Makefile.am b/t/src/Makefile.am index 7fe1797..3ff0c5f 100644 --- a/t/src/Makefile.am +++ b/t/src/Makefile.am @@ -6,8 +6,7 @@ INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" -I $(srcdir)/../../include \ -I $(srcdir)/../../utf8 CFLAGS = -g -O2 @EXTRA_CFLAGS@ -noinst_PROGRAMS = testgedcom pathtest gomtest updatetest @EXTRA_PROGS@ -EXTRA_PROGRAMS = gomtest_static +noinst_PROGRAMS = testgedcom pathtest gomtest updatetest testintl noinst_HEADERS = output.h dump_gom.h portability.h testgedcom_SOURCES = standalone.c output.c portability.c @@ -22,14 +21,14 @@ gomtest_SOURCES = gomtest.c output.c dump_gom.c portability.c gomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs gomtest_LDADD = -lgedcom_gom -lgedcom @INTLLIBS@ -gomtest_static_SOURCES = gomtest.c output.c dump_gom.c portability.c -gomtest_static_LDADD = ../../gedcom/.libs/libgedcom.a \ - ../../gom/.libs/libgedcom_gom.a - updatetest_SOURCES = update.c output.c portability.c updatetest_LDFLAGS = -L../../gedcom/.libs updatetest_LDADD = -lgedcom @INTLLIBS@ -TEST_SCRIPT=test_script test_gom test_update +testintl_SOURCES = testintl.c output.c +testintl_LDFLAGS = -L../../gedcom/.libs +testintl_LDADD = -lgedcom @INTLLIBS@ + +TEST_SCRIPT=test_script test_gom test_update test_intl EXTRA_DIST=$(TEST_SCRIPT) diff --git a/t/src/test_gom b/t/src/test_gom index 33b680f..7cfd657 100755 --- a/t/src/test_gom +++ b/t/src/test_gom @@ -52,17 +52,7 @@ ln -s $srcdir/../iconv/glibc/gconv-modules . rm -f core echo "======================================================">> $logfile echo "Performing test '$test_name'" >> $logfile -if [ "$GOM_DMALLOC_TEST" = "" ] -then - $ltcmd $GEDCOM_TESTENV $builddir/src/gomtest $options $testfile -else - dmalloc=`which dmalloc` - dmalloc_tmp=dmalloc.env - $dmalloc -b -l $GOM_DMALLOC_TEST -i 100 low > $dmalloc_tmp - . $dmalloc_tmp - rm $dmalloc_tmp - $ltcmd $GEDCOM_TESTENV $builddir/src/gomtest_static $options $testfile -fi +$ltcmd $GEDCOM_TESTENV $builddir/src/gomtest $options $testfile result=$? rm gedcom.enc rm ANSI_Z39.47.so