dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
133000d
)
Removed support for testing with dmalloc (valgrind is better...).
author
Peter Verthez
<Peter.Verthez@advalvas.be>
Sun, 3 Nov 2002 12:48:34 +0000
(12:48 +0000)
committer
Peter Verthez
<Peter.Verthez@advalvas.be>
Sun, 3 Nov 2002 12:48:34 +0000
(12:48 +0000)
configure.in
patch
|
blob
|
history
gedcom/gedcom_internal.h
patch
|
blob
|
history
gom/gom_internal.h
patch
|
blob
|
history
t/Makefile.am
patch
|
blob
|
history
t/src/Makefile.am
patch
|
blob
|
history
t/src/test_gom
patch
|
blob
|
history
diff --git
a/configure.in
b/configure.in
index 82e16b7a8d9901dc960cd8eb1779b2a26294ab9f..fbb85eca367a1ea203a88a156acf8471baa3ff7c 100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-58,13
+58,6
@@
fi
dnl =============================================================
dnl Checks for libraries.
AM_GNU_GETTEXT([use-libtool],[need-ngettext])
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.
dnl =============================================================
dnl Checks for typedefs, structures, and compiler characteristics.
diff --git
a/gedcom/gedcom_internal.h
b/gedcom/gedcom_internal.h
index 9807ecb759f22678807ada7d9f364fe8f0d410d7..9947c9b75dd3ff54942aaebd5196f806d8bc6220 100644
(file)
--- a/
gedcom/gedcom_internal.h
+++ b/
gedcom/gedcom_internal.h
@@
-32,9
+32,6
@@
#include <config.h>
#endif
#include <libintl.h>
#include <config.h>
#endif
#include <libintl.h>
-#ifdef WITH_DMALLOC
-#include <dmalloc.h>
-#endif
#define _(string) gettext(string)
#define N_(string) (string)
#define _(string) gettext(string)
#define N_(string) (string)
diff --git
a/gom/gom_internal.h
b/gom/gom_internal.h
index 86e34ab0b67ecbcfc33f139c1286b149de18dd72..0ef609bd3dc6414a51a4145b1d891f86940e4611 100644
(file)
--- a/
gom/gom_internal.h
+++ b/
gom/gom_internal.h
@@
-29,9
+29,6
@@
#include <libintl.h>
#include "gom.h"
#include "gedcom.h"
#include <libintl.h>
#include "gom.h"
#include "gedcom.h"
-#ifdef WITH_DMALLOC
-#include <dmalloc.h>
-#endif
#define _(string) gettext(string)
#define N_(string) (string)
#define _(string) gettext(string)
#define N_(string) (string)
diff --git
a/t/Makefile.am
b/t/Makefile.am
index 0182fcc15f2ef6047543c37de1a0bd2300e3b9b9..a95ff704bb385acad470db4f182306a646038885 100644
(file)
--- a/
t/Makefile.am
+++ b/
t/Makefile.am
@@
-4,7
+4,6
@@
SUBDIRS=src input output .
SUBDIRS=src input output .
-DMALLOC_LOG = dmalloc.log
TESTS := $(wildcard $(srcdir)/*.test)
EXTRA_DIST=$(TESTS)
TESTS := $(wildcard $(srcdir)/*.test)
EXTRA_DIST=$(TESTS)
@@
-21,17
+20,3
@@
check-% : %.test all-local
else \
echo "Test failed"; \
fi
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 7fe179798333f59fb8b93f15ec6ffa26eff69cf7..3ff0c5fefce7bb05ff8f5ae83cacddb2e44f9cb5 100644
(file)
--- 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@
-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
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_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@
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)
EXTRA_DIST=$(TEST_SCRIPT)
diff --git
a/t/src/test_gom
b/t/src/test_gom
index 33b680f2eb079d403d0280d83e196240b899088c..7cfd657c893d723105c96c262fa9ec80809c2233 100755
(executable)
--- 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
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
result=$?
rm gedcom.enc
rm ANSI_Z39.47.so