- libxslt/xsltproc.c: added --xinclude in the option list,

patch from Raphael Hertzog
- test/docbook/Makefile.am: force at least the gdp-handbook.xml
  test in the normal testsuite
Daniel
This commit is contained in:
Daniel Veillard 2001-05-23 12:14:10 +00:00
parent 59cd2492c0
commit 5256b326be
3 changed files with 35 additions and 3 deletions

View File

@ -1,3 +1,10 @@
Wed May 23 13:25:37 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* libxslt/xsltproc.c: added --xinclude in the option list,
patch from Raphael Hertzog
* test/docbook/Makefile.am: force at least the gdp-handbook.xml
test in the normal testsuite
Wed May 23 00:05:19 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* libxslt/variables.c: Mark Vakoc found a bug in variable eval

View File

@ -99,6 +99,9 @@ static void usage(const char *name) {
#ifdef LIBXML_CATALOG_ENABLED
printf(" --catalogs : use the catalogs from $SGML_CATALOG_FILES\n");
#endif
#ifdef LIBXML_XINCLUDE_ENABLED
printf(" --xinclude : do XInclude processing on document intput\n");
#endif
}
int
@ -211,8 +214,8 @@ main(int argc, char **argv) {
}
params[nbparams] = NULL;
xmlSubstituteEntitiesDefault(1);
if (novalid == 0)
xmlLoadExtDtdDefaultValue = 1;
if (novalid == 0) /* TODO XML_DETECT_IDS | XML_COMPLETE_ATTRS */
xmlLoadExtDtdDefaultValue = 6;
else
xmlLoadExtDtdDefaultValue = 0;
for (i = 1; i < argc ; i++) {

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
all: # Avoid doing the test in normal pass
all: single # Avoid doing the test in normal pass
$(top_builddir)/libxslt/xsltproc:
@(cd ../../libxslt ; make xsltproc)
@ -9,6 +9,28 @@ EXTRA_DIST = README VERSION
tests: html
#
# a single tests to check that stuff ain't broken
#
single:
@(echo > .memdump)
@(for i in $(srcdir)/test/gdp-handbook.xml ; do \
echo $$i ; \
out=$(srcdir)/result/html/`basename $$i .xml`.tst; \
html=$(srcdir)/result/html/`basename $$i .xml`.html; \
$(top_builddir)/libxslt/xsltproc --nonet $(srcdir)/html/docbook.xsl $$i > $$out ; \
if [ -f $$html ] ; then \
grep -v id < $$html > $$html.noid ; \
grep -v id < $$out > $$out.noid ; \
diff $$html.noid $$out.noid ; \
rm -f $$html.noid $$out.noid ; \
else mv $$out $$html ; fi ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\
rm -f $$out ; done )
#
# The full set of tests
#
html: $(top_builddir)/libxslt/xsltproc
@(echo > .memdump)
@(for i in $(srcdir)/test/*.xml ; do \