diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 26de7d0..c5763ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -158,7 +158,7 @@ HTMLPushtests : testHTML$(EXEEXT) if [ ! -d $$i ] ; then \ if [ ! -f $(srcdir)/result/HTML/$$name ] ; then \ echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testHTML $$i > $(srcdir)/result/HTML/$$name 2>$(srcdir)/result/HTML/$$name.err ; \ + $(CHECKER) $(top_builddir)/testHTML --push $$i > $(srcdir)/result/HTML/$$name 2>$(srcdir)/result/HTML/$$name.err ; \ else \ log=`$(CHECKER) $(top_builddir)/testHTML --push $$i > result.$$name 2> error.$$name ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ @@ -191,7 +191,7 @@ HTMLPushtests : testHTML$(EXEEXT) if [ ! -d $$i ] ; then \ if [ ! -f $(srcdir)/result/HTML/$$name ] ; then \ echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/testHTML --sax $$i > $(srcdir)/result/HTML/$$name.sax ; \ + $(CHECKER) $(top_builddir)/testHTML --push --sax $$i > $(srcdir)/result/HTML/$$name.sax ; \ else \ log=`$(CHECKER) $(top_builddir)/testHTML --push --sax $$i 2>&1 > result.$$name.sax ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ @@ -328,12 +328,12 @@ Errtests : xmllint$(EXEEXT) if [ ! -d $$i ] ; then \ if [ ! -f $(srcdir)/result/errors/$$name.str ] ; then \ echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint $$i \ + $(CHECKER) $(top_builddir)/xmllint --stream $$i \ 2> $(srcdir)/result/errors/$$name.str \ > $(srcdir)/result/errors/$$name ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ else \ - log=`$(CHECKER) $(top_builddir)/xmllint $$i 2> error.$$name > result.$$name ; \ + log=`$(CHECKER) $(top_builddir)/xmllint --stream $$i 2> error.$$name > result.$$name ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ diff $(srcdir)/result/errors/$$name result.$$name ; \ diff $(srcdir)/result/errors/$$name.str error.$$name` ; \ @@ -483,7 +483,7 @@ XIncludetests : xmllint$(EXEEXT) if [ ! -d $$i ] ; then \ if [ ! -f $(srcdir)/result/XInclude/$$name.rdr ] ; then \ echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --walker --debug $$i > $(srcdir)/result/XInclude/$$name.rdr ; \ + $(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --stream --debug $$i > $(srcdir)/result/XInclude/$$name.rdr ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ else \ log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --stream --debug $$i > result.$$name 2>error.$$name | grep -v 'failed to load external entity' ; \ @@ -523,7 +523,7 @@ Catatests : xmlcatalog$(EXEEXT) if [ -f $$xml ] ; then \ if [ ! -f $(srcdir)/result/catalogs/$$name ] ; then \ echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmlcatalog --shell $$xml < $$i > $(srcdir)/result/catalogs/$$name ; \ + $(CHECKER) $(top_builddir)/xmlcatalog --shell $$xml < $$i 2>&1 > $(srcdir)/result/catalogs/$$name ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ else \ log=`$(CHECKER) $(top_builddir)/xmlcatalog --shell $$xml < $$i 2>&1 > result.$$name ; \ @@ -642,6 +642,22 @@ Readertests : xmllint$(EXEEXT) if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ rm result.$$name ; \ fi ; fi ; done) + @echo "## Reader entities substitution regression tests" + -@(for i in $(srcdir)/test/* ; do \ + name=`basename $$i`; \ + if [ ! -d $$i ] ; then \ + if [ ! -f $(srcdir)/result/$$name.rde ] ; then \ + echo New test file $$name ; \ + $(CHECKER) $(top_builddir)/xmllint --noent --nonet --debug --stream $$i > $(srcdir)/result/$$name.rde 2>/dev/null ; \ + grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ + else \ + log=`$(CHECKER) $(top_builddir)/xmllint --noent --nonet --debug --stream $$i > result.$$name 2>/dev/null ; \ + grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ + diff $(srcdir)/result/$$name.rde result.$$name` ; \ + if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ + rm result.$$name ; \ + fi ; fi ; done) + SAXtests : testSAX$(EXEEXT) @(echo > .memdump) @echo "## SAX callbacks regression tests" @@ -960,16 +976,16 @@ EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \ example/Makefile.am example/gjobread.c example/gjobs.xml \ $(man_MANS) libxml-2.0.pc.in libxml-2.0-uninstalled.pc.in \ trionan.c trionan.h triostr.c triostr.h trio.c trio.h \ - triop.h triodef.h libxml.h \ + triop.h triodef.h libxml.h elfgcchack.h \ testThreadsWin32.c genUnicode.py TODO_SCHEMAS \ - dbgen.pl dbgenattr.pl + dbgen.pl dbgenattr.pl regressions.py regressions.xml pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libxml-2.0.pc # -# Instll the tests program sources as examples +# Install the tests program sources as examples # BASE_DIR=$(datadir)/doc DOC_MODULE=libxml2-$(VERSION) |