diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2003-12-09 11:35:37 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2003-12-09 11:35:37 +0000 |
| commit | e74d2e1cb85b184b327c1b41d2b1c2dfbcc653d7 (patch) | |
| tree | 6d842f169da842b21c0c5d962534d52272d704dd /Makefile.am | |
| parent | b5fa02085e6de2dfb5b05e7c6ba0eb2efb6130b4 (diff) | |
| download | android_external_libxml2-e74d2e1cb85b184b327c1b41d2b1c2dfbcc653d7.tar.gz android_external_libxml2-e74d2e1cb85b184b327c1b41d2b1c2dfbcc653d7.tar.bz2 android_external_libxml2-e74d2e1cb85b184b327c1b41d2b1c2dfbcc653d7.zip | |
augmented the XInclude API to be able to pass XML parser flags down to the
* xinclude.c xmllint.c xmlreader.c include/libxml/xinclude.h
include/libxml/xmlerror.h: augmented the XInclude API
to be able to pass XML parser flags down to the Inclusion
process. Also resynchronized with the Last Call W3C Working
Draft 10 November 2003 for the xpointer attribute.
* Makefile.am test/XInclude/docs/nodes[23].xml
result/XInclude/*: augmented the tests for the new namespace and
testing the xpointer attribute, changed the way error messages
are tested
* doc/*: regenerated the documentation
Daniel
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index f10ed55a..cedd5205 100644 --- a/Makefile.am +++ b/Makefile.am @@ -405,14 +405,15 @@ XIncludetests : xmllint$(EXEEXT) if [ ! -d $$i ] ; then \ if [ ! -f $(srcdir)/result/XInclude/$$name ] ; then \ echo New test file $$name ; \ - $(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude $$i > $(srcdir)/result/XInclude/$$name ; \ + $(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude $$i > $(srcdir)/result/XInclude/$$name 2> $(srcdir)/result/XInclude/$$name.err ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ else \ - log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude $$i 2>&1 > result.$$name | grep -v 'failed to load external entity' ; \ + log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude $$i > result.$$name 2>error.$$name | grep -v 'failed to load external entity' ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ - diff $(srcdir)/result/XInclude/$$name result.$$name` ; \ + diff $(srcdir)/result/XInclude/$$name result.$$name ; \ + diff $(srcdir)/result/XInclude/$$name.err error.$$name` ; \ if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ + rm result.$$name error.$$name ; \ fi ; fi ; done) @(echo > .memdump) @echo "## XInclude xmlReader regression tests" @@ -424,11 +425,12 @@ XIncludetests : xmllint$(EXEEXT) $(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --walker --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 2>&1 > result.$$name | grep -v 'failed to load external entity' ; \ + log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --stream --debug $$i > result.$$name 2>error.$$name | grep -v 'failed to load external entity' ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\ + diff $(srcdir)/result/XInclude/$$name.err error.$$name ; \ diff $(srcdir)/result/XInclude/$$name.rdr result.$$name` ; \ if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \ - rm result.$$name ; \ + rm result.$$name error.$$name ; \ fi ; fi ; done) Scripttests : xmllint$(EXEEXT) |