diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-11-14 13:13:40 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-11-14 13:13:40 +0900 |
| commit | 89b6a9c1a88da19418794620640ea4877bfe2b95 (patch) | |
| tree | 502c6e173ae8014e647cb7710af111fdaf73bf44 /tests | |
| parent | a4f3dbe89311f8270adce767f7d086a40e5f4369 (diff) | |
| parent | 52575733efa1b63a3f5fa615821c38c54387d409 (diff) | |
| download | libxslt-tizen_4.0_base.tar.gz libxslt-tizen_4.0_base.tar.bz2 libxslt-tizen_4.0_base.zip | |
Merge branch 'tizen_base' into tizen_4.0_basesubmit/tizen_4.0_base/20191114.041510tizen_4.0_base
Diffstat (limited to 'tests')
188 files changed, 2198 insertions, 318 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 3eb1c3f4..5645bb01 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS=docs REC1 REC2 REC general namespaces keys numbers documents \ extensions reports xmlspec multiple xinclude XSLTMark docbook \ - exslt plugins + exslt plugins fuzz all: diff --git a/tests/Makefile.in b/tests/Makefile.in index 58e2b977..dbb4f12e 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -131,7 +131,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -208,6 +208,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -287,12 +288,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -302,6 +302,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -357,7 +358,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = docs REC1 REC2 REC general namespaces keys numbers documents \ extensions reports xmlspec multiple xinclude XSLTMark docbook \ - exslt plugins + exslt plugins fuzz all: all-recursive @@ -379,8 +380,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -497,7 +498,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/REC/Makefile.in b/tests/REC/Makefile.in index 895d32c9..d34d9016 100644 --- a/tests/REC/Makefile.in +++ b/tests/REC/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -396,8 +397,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -421,7 +422,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/REC/test-7.1.4.out b/tests/REC/test-7.1.4.out index bd366cd3..367af25f 100644 --- a/tests/REC/test-7.1.4.out +++ b/tests/REC/test-7.1.4.out @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" quadding="start" font-size="12pt" font-weight="bold">this is the heading</fo:block> +<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="12pt" font-weight="bold" quadding="start">this is the heading</fo:block> diff --git a/tests/REC1/Makefile.in b/tests/REC1/Makefile.in index f1293e2c..89d353c5 100644 --- a/tests/REC1/Makefile.in +++ b/tests/REC1/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -317,8 +318,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -342,7 +343,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/REC2/Makefile.in b/tests/REC2/Makefile.in index 9fb981a3..f45ff8fd 100644 --- a/tests/REC2/Makefile.in +++ b/tests/REC2/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -317,8 +318,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -342,7 +343,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/XSLTMark/Makefile.in b/tests/XSLTMark/Makefile.in index 9e9ebb01..1591b081 100644 --- a/tests/XSLTMark/Makefile.in +++ b/tests/XSLTMark/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -369,8 +370,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -394,7 +395,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/docbook/Makefile.in b/tests/docbook/Makefile.in index ec97f9cd..5f67ae4b 100644 --- a/tests/docbook/Makefile.in +++ b/tests/docbook/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -317,8 +318,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -342,7 +343,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/docbook/result/fo/gdp-handbook.fo b/tests/docbook/result/fo/gdp-handbook.fo index 7078f867..2300ebff 100644 --- a/tests/docbook/result/fo/gdp-handbook.fo +++ b/tests/docbook/result/fo/gdp-handbook.fo @@ -92,11 +92,11 @@ <fo:block text-align="center" margin-left="-4pc" keep-with-next="always" font-size="24.8832pt" font-weight="bold" font-family="Helvetica"> <fo:block keep-with-next.within-column="always" hyphenate="false">The GNOME Handbook of Writing Software Documentation</fo:block> </fo:block> - <fo:block>David Mason<fo:block><fo:block>Red Hat, Inc.</fo:block><fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block>David Mason<fo:block><fo:block>Red Hat, Inc.</fo:block><fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false"> <fo:inline font-family="Courier"><dcm@redhat.com></fo:inline> - </fo:block></fo:block>Daniel Mueth<fo:block><fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + </fo:block></fo:block>Daniel Mueth<fo:block><fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false"> <fo:inline font-family="Courier"><d-mueth@uchicago.edu></fo:inline> - </fo:block></fo:block>Alexander Kirillov<fo:block><fo:block wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + </fo:block></fo:block>Alexander Kirillov<fo:block><fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" linefeed-treatment="preserve" white-space-collapse="false"> <fo:inline font-family="Courier"><kirillov@math.sunysb.edu></fo:inline> </fo:block></fo:block></fo:block> <fo:block> @@ -382,7 +382,7 @@ people to make announcements and suggestions and to discuss issues in the comments section. </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2979832"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348418272"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Note</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Note that the information in the @@ -409,7 +409,7 @@ source nature of SGML. To contribute to the GDP you should learn to use DocBook. </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2979895"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348423072"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> To get started writing for the GDP you do not need to rush @@ -490,8 +490,8 @@ DTD's. To install the GDP custom DTD with PNG image support by hand: </fo:block> - <fo:list-block id="id2980206" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2980213" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348443424" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348444000"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -506,7 +506,7 @@ </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2980259" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348447456"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -517,11 +517,11 @@ distribution. (On Red Hat it is usually in /usr/lib/sgml/CATALOG.) Add the following line to this file: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.0//EN" "png-support-3.0.dtd" </fo:block> If you are using the 3.1 DTD, use: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN" "png-support-3.1.dtd" </fo:block> </fo:block> @@ -540,14 +540,14 @@ PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN" "png-support-3.1.dtd" </fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Articles: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <!DOCTYPE Article PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[]> </fo:block> </fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Books: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <!DOCTYPE Book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[]> </fo:block> @@ -620,7 +620,7 @@ V1.1//EN"[]> mydocument.sgml</fo:inline>, after which you can print out or view the resulting .ps file. </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2980630"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348464736"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> The html files you get will not look quite the same as the @@ -656,7 +656,7 @@ V1.1//EN"[]> include the extension of the image file, since DocBook Tools will automatically insert it for you. For example: </fo:block> - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <figure> <title>My Image</title> @@ -676,7 +676,7 @@ V1.1//EN"[]> the directory. </fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> - If you want to create PostScript ouput, you will need to create an + If you want to create PostScript output, you will need to create an EPS version of your image file to be displayed in the PostScript file. There is a simple script available which allows you to change a PNG image into an EPS file @@ -700,8 +700,8 @@ V1.1//EN"[]> The following resources on the web are useful for learning DocBook: </fo:block> - <fo:list-block id="id2980841" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2980848" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348478752" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348479328"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -715,7 +715,7 @@ V1.1//EN"[]> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2980882" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348482016"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -728,7 +728,7 @@ V1.1//EN"[]> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2980911" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348484128"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -742,7 +742,7 @@ V1.1//EN"[]> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2980940" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348486240"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -766,8 +766,8 @@ V1.1//EN"[]> The following sections of this document are designed to help documentation authors write correct and consistent DocBook: </fo:block> - <fo:list-block id="id2980987" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2980994" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348489696" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348490272"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1373,8 +1373,8 @@ V1.1//EN"[]> advised</fo:inline> that the documentation writers conform to XML syntax rules. Here are most important differences: </fo:block> - <fo:list-block id="id2982897" provisional-distance-between-starts="1in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> - <fo:list-item id="id2982900" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348613152" provisional-distance-between-starts="1in" provisional-label-separation="0.25in"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348613536"> <fo:list-item-label end-indent="label-end()"> <fo:block> <fo:inline> <fo:inline font-style="italic">Minimization</fo:inline></fo:inline> @@ -1395,7 +1395,7 @@ V1.1//EN"[]> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2983001" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348621792"> <fo:list-item-label end-indent="label-end()"> <fo:block> <fo:inline> <fo:inline font-style="italic">Self-closing tags</fo:inline></fo:inline> @@ -1415,7 +1415,7 @@ V1.1//EN"[]> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2983063" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348626976"> <fo:list-item-label end-indent="label-end()"> <fo:block> <fo:inline> <fo:inline font-style="italic">Case sensitive tags</fo:inline></fo:inline> @@ -1487,7 +1487,7 @@ V1.1//EN"[]> <fo:inline font-family="Courier"><note></fo:inline>, <fo:inline font-family="Courier"><tip></fo:inline>, <fo:inline font-family="Courier"><warning></fo:inline>, <fo:inline font-family="Courier"><important></fo:inline> respectively. For example: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <tip> <title>TIP</title> @@ -1521,7 +1521,7 @@ V1.1//EN"[]> To include screenshots and other figures, use the following tags: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <figure id="shot1"> <title>Screenshot</title> @@ -1537,7 +1537,7 @@ V1.1//EN"[]> <fo:block id="shot1" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after.minimum="1em" space-after.optimum="1.5em" space-after.maximum="2em" keep-with-previous.within-column="always"><fo:block font-weight="bold" font-size="12pt" hyphenate="false" keep-with-next.within-column="always" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Screenshot</fo:block><fo:block><fo:block><fo:external-graphic src="url(file:figures/example_screenshot)" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block></fo:block></fo:block> </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2983467"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348576864"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Notice in this example that the screenshot file name does @@ -1557,7 +1557,7 @@ V1.1//EN"[]> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> To show a file fragment--for example, program listing--use <fo:inline font-family="Courier"><programlisting></fo:inline> tag: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <programlisting> [Desktop Entry] @@ -1569,7 +1569,7 @@ Type=Application </programlisting> </fo:block> which produces - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> [Desktop Entry] Name=Gnumeric spreadsheet Exec=gnumeric @@ -1584,7 +1584,7 @@ Type=Application To show a record of terminal session--i.e., sequence of commands entered at the command line--use <fo:inline font-family="Courier"><screen></fo:inline> tag: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <screen> <prompt>bash$</prompt><userinput>make love</userinput> @@ -1592,14 +1592,14 @@ make: *** No rule to make target `love'. Stop. </screen> </fo:block> which produces - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <fo:inline font-family="Courier">bash$</fo:inline><fo:inline font-weight="bold" font-family="Courier">make love</fo:inline> make: *** No rule to make target `love'. Stop. </fo:block> Note the use of tags <fo:inline font-family="Courier"><prompt></fo:inline> and <fo:inline font-family="Courier"><userinput></fo:inline> for marking system prompt and commands entered by user. - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2983637"><fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348664224"><fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Note that both <fo:inline font-family="Courier"><programlisting></fo:inline> and <fo:inline font-family="Courier"><screen></fo:inline> preserve linebreaks, but interpret SGML tags (unlike LaTeX @@ -1623,8 +1623,8 @@ make: *** No rule to make target `love'. Stop. <fo:inline font-family="Courier"><orderedlist></fo:inline>, and <fo:inline font-family="Courier"><variablelist></fo:inline>. </fo:block> - <fo:list-block id="id2983722" provisional-distance-between-starts="1in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> - <fo:list-item id="id2983725" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348671520" provisional-distance-between-starts="1in" provisional-label-separation="0.25in"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348671904"> <fo:list-item-label end-indent="label-end()"> <fo:block> <fo:inline> <fo:inline font-family="Courier"><itemizedlist></fo:inline></fo:inline> @@ -1634,7 +1634,7 @@ make: *** No rule to make target `love'. Stop. <fo:block> This is the simplest unnumbered list, parallel to <fo:inline font-family="Courier"><ul></fo:inline> in HTML. Here is an example: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <itemizedlist> <listitem> @@ -1663,8 +1663,8 @@ make: *** No rule to make target `love'. Stop. </fo:block> and output: </fo:block> - <fo:list-block id="id2983762" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2983766" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348675360" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348675744"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1676,7 +1676,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2983811" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348677856"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1689,7 +1689,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2983834" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348679968"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1718,7 +1718,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2983961" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348689568"> <fo:list-item-label end-indent="label-end()"> <fo:block> <fo:inline> <fo:inline font-family="Courier"><orderedlist></fo:inline></fo:inline> @@ -1741,7 +1741,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2984039" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348696480"> <fo:list-item-label end-indent="label-end()"> <fo:block> <fo:inline> <fo:inline font-family="Courier"><variablelist></fo:inline></fo:inline> @@ -1758,7 +1758,7 @@ make: *** No rule to make target `love'. Stop. computer to search. The lines you are reading now were produced by <fo:inline font-family="Courier"><variablelist></fo:inline>. The source looked liked this: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <variablelist> <varlistentry> @@ -1812,8 +1812,8 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:block> </fo:block> - <fo:list-block id="id2984177" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2984180" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348705888" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348706272"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1824,7 +1824,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2984198" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348708192"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1839,7 +1839,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2984234" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348711456"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1850,7 +1850,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2984251" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348713184"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1860,7 +1860,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2984267" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348714912"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1871,7 +1871,7 @@ make: *** No rule to make target `love'. Stop. </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2984285" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348716640"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1888,7 +1888,7 @@ make: *** No rule to make target `love'. Stop. Main Menu->Utilities->GNOME terminal there is a special construction for this, too: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <menuchoice> <guimenu>Main Menu</guimenu> <guisubmenu>Utilities</guisubmenu> @@ -1911,7 +1911,7 @@ make: *** No rule to make target `love'. Stop. automatically inserts the full name of the element you refer to (section, figure, etc.), while the second just creates a link (in HTML output). Here is an example: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> An example of a <link linkend="extip">tip</link> was given in <xref linkend="notes" />. </fo:block> @@ -1925,7 +1925,7 @@ An example of a <link linkend="extip">tip</link> was given in <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> To produce a link to an external source, such as a Web page or a local file, use <fo:inline font-family="Courier"><ulink></fo:inline> tag, for example: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> To find more about GNOME, please visit <ulink type="http" url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> @@ -1951,8 +1951,8 @@ url="http://www.gnome.org">GNOME Web page</ulink> Here are some tags used to describe operating system-related things: </fo:block> - <fo:list-block id="id2984574" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2984578" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348729504" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348729888"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1966,7 +1966,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2984618" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348733728"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1980,7 +1980,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2984666" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348737760"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -1994,7 +1994,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2984707" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348741600"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2006,7 +2006,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2984739" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348744672"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2020,7 +2020,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2984780" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348748512"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2066,7 +2066,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> To mark up a combination of keystrokes, use the <fo:inline font-family="Courier"><keycombo></fo:inline> wrapper: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <keycombo> <keycap>Ctrl</keycap> @@ -2078,7 +2078,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Finally, if you want to show a shortcut for some menu command, here are the appropriate tags (rather long): - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <menuchoice> <shortcut> @@ -2101,7 +2101,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> To mark up e-mail address, use <fo:inline font-family="Courier"><email></fo:inline>: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> The easiest way to get in touch with me is by e-mail (<email>me@mydomain.com</email>) </fo:block> @@ -2131,8 +2131,8 @@ url="http://www.gnome.org">GNOME Web page</ulink> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> here is partial list of most commonly used enitites: </fo:block> - <fo:list-block id="id2985133" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> - <fo:list-item id="id2985136" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348792672" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348793056"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2142,7 +2142,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2985150" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348794592"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2152,7 +2152,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2985164" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348796128"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2162,7 +2162,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2985179" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348798240"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2172,7 +2172,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:list-item-body> </fo:list-item> - <fo:list-item id="id2985192" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> + <fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348799968"> <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> @@ -2260,7 +2260,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Application documentation should identify the version of the application for which the documentation is written: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <sect1 id="intro"> <title>Introduction</title> @@ -2336,7 +2336,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> PNG format only) when appropriate. They should also describe each feature and preference option available. </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2985521"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348824736"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Documentation Availability</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Applications and applets should not rely on documentation @@ -2352,7 +2352,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> versions 1.x and the templates in <fo:basic-link internal-destination="template2-2x">the section called “Template 2: Applet Manual For GNOME 2.x”</fo:basic-link> for GNOME versions 2.x. </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2985590"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348828768"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Manuals For Large Applications</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Manuals for very large applications, such as GNOME Workshop @@ -2363,7 +2363,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> <fo:inline font-family="Courier"><sect1></fo:inline>). </fo:block> </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2985636"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348832800"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Applet Manuals in GNOME 2.0</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Note that applet manuals in GNOME 2.0 are treated in a special @@ -2393,7 +2393,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> </fo:block> </fo:block> </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2985728"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348839328"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Developer Information</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> This section is for developers. Documentation authors @@ -2406,7 +2406,7 @@ url="http://www.gnome.org">GNOME Web page</ulink> Help menu at the top right of the application. To do this, you must first write a <fo:inline font-family="Courier">topic.dat</fo:inline> file. The format for this file is: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> One line for each 'topic'. Two columns, as defined by perl -e 'split(/\s+/,$aline,2)' @@ -2418,7 +2418,7 @@ Second column is the user-visible topic name. </fo:block> For example, Gnumeric's <fo:inline font-family="Courier">topic.dat</fo:inline> file is: - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> gnumeric.html Gnumeric manual function-reference.html Gnumeric function reference </fo:block> @@ -2430,7 +2430,7 @@ function-reference.html Gnumeric function reference from SGML into HTML with <fo:inline font-weight="bold">db2html</fo:inline>) should be placed in this directory too. </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2985873"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348850272"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Note</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> If the help files are not present in the correct directory, the @@ -2441,7 +2441,7 @@ function-reference.html Gnumeric function reference The <fo:inline font-family="Courier">topic.dat</fo:inline> file is used by the GNOME menu building code to generate the Help menu. When you define your menu: -<fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> +<fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> GnomeUIInfo helpmenu[] = { {GNOME_APP_UI_ITEM, N_("About"), N_("Info about this program"), @@ -2470,7 +2470,7 @@ GnomeUIInfo helpmenu[] = { </fo:block> </fo:block> </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2986001"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348777696"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Developer Information</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> This section is for developers. Documentation authors @@ -2494,7 +2494,7 @@ GnomeUIInfo helpmenu[] = { To make the Help buttons call the correct document in the GNOME Help Browser the developer should add code based on the following example: </fo:block> - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> gchar *tmp; tmp = gnome_help_file_find_file ("module", "page.html"); if (tmp) { @@ -2502,7 +2502,7 @@ if (tmp) { g_free(tmp); } </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2986105"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348859104"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> The example above is in the C language, please refer to other @@ -2572,7 +2572,7 @@ if (tmp) { </fo:block> </fo:block> </fo:block> - <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2986296"> + <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="idp106373348872928"> <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Developer Information</fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> This section is for developers. Documentation authors @@ -2588,7 +2588,7 @@ if (tmp) { </fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> To add an applet's manual to its applet menu, use: -<fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> +<fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> /* add an item to the applet menu */ applet_widget_register_callback(APPLET_WIDGET(applet), "manual", _("Manual"), &open_manual, NULL); @@ -2608,7 +2608,7 @@ _("Manual"), &open_manual, NULL); You will also want to add an About menu item to the applet's menu. This is a stock menu item and is done: -<fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> +<fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", GNOME_STOCK_MENU_ABOUT, _("About"), &my_applet_cb_about, NULL); @@ -2740,7 +2740,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> Just as you need to juggle expert and novice readers, you'll have to juggle a number of other extremes as you write: - <fo:list-block id="id2986718" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"><fo:list-item id="id2986722" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> + <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348901152" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"><fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348901536"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> Documents should be complete, yet concise. You should describe every feature, but you'll have decide how much detail is really necessary. It's not, for example, @@ -2750,7 +2750,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", you spend fewer words on the obvious, you can spend more time clarifying the ambiguous labels and explaining items that are more complex. - </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2986742" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> + </fo:block></fo:list-item-body></fo:list-item><fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348902688"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> Be engaging and friendly, yet professional. Games documents may be less formal than productivity application documents (people don't @@ -2759,14 +2759,14 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", maintain a standard of style which holds the reader's interest without resorting to jokes and untranslatable allusions or puns. - </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2986772" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> + </fo:block></fo:list-item-body></fo:list-item><fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348904992"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> Examples, tips, notes, and screenshots are useful to break up long stretches of text, but too many can get in the way, and make your documents too choppy to read. It's good to provide a screenshot of any dialog windows a user might run into, but if a dialog box has several tabs, it's not usually necessary to have one for each. - </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2986790" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> + </fo:block></fo:list-item-body></fo:list-item><fo:list-item space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" id="idp106373348906144"><fo:list-item-label end-indent="label-end()"><fo:block>•</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block> The GDP strives to have all of its documentation conform to certain standards of style and content, but every document (and every writer) is different. You will need @@ -3055,7 +3055,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", manuals. You can always get the latest copy of this template from <fo:basic-link external-destination="http://developer.gnome.org/projects/gdp/templates.html">GDP Documentation Templates</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/projects/gdp/templates.html]</fo:inline>. - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <!DOCTYPE Article PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[ @@ -3809,7 +3809,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", where <fo:inline font-family="Courier"><fo:inline font-style="italic" font-family="Courier">appletname</fo:inline></fo:inline> is the name of the applet. - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <!DOCTYPE Article PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[ @@ -3889,7 +3889,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", </fo:block> - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <!-- Template Version: 1.0.1 (do not remove this line) --> @@ -4148,7 +4148,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", the applet document. </fo:block> <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[ <!ENTITY TEMPLATE-APPLET SYSTEM "gnome-applet-template.sgml.part"> @@ -4603,7 +4603,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), "about", </fo:block> - <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em"> + <fo:block font-family="Courier" font-size="9pt" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve"> <!-- Please replace everywhere below GNOMEAPPLET with the name of --> diff --git a/tests/docbook/result/html/gdp-handbook.html b/tests/docbook/result/html/gdp-handbook.html index 211e6207..026beb67 100644 --- a/tests/docbook/result/html/gdp-handbook.html +++ b/tests/docbook/result/html/gdp-handbook.html @@ -328,7 +328,7 @@ V1.1//EN"[]> automatically look for <tt>myfile.png</tt> in the directory. </p><p> - If you want to create PostScript ouput, you will need to create an + If you want to create PostScript output, you will need to create an EPS version of your image file to be displayed in the PostScript file. There is a simple script available which allows you to change a PNG image into an EPS file diff --git a/tests/docbook/result/xhtml/gdp-handbook.xhtml b/tests/docbook/result/xhtml/gdp-handbook.xhtml index dff9a72b..ca7199ed 100644 --- a/tests/docbook/result/xhtml/gdp-handbook.xhtml +++ b/tests/docbook/result/xhtml/gdp-handbook.xhtml @@ -329,7 +329,7 @@ V1.1//EN"[]> automatically look for <tt>myfile.png</tt> in the directory. </p><p> - If you want to create PostScript ouput, you will need to create an + If you want to create PostScript output, you will need to create an EPS version of your image file to be displayed in the PostScript file. There is a simple script available which allows you to change a PNG image into an EPS file diff --git a/tests/docbook/result/xtchunk/html/indexs02.orig b/tests/docbook/result/xtchunk/html/indexs02.orig index 09712068..04500681 100644 --- a/tests/docbook/result/xtchunk/html/indexs02.orig +++ b/tests/docbook/result/xtchunk/html/indexs02.orig @@ -222,7 +222,7 @@ V1.1//EN"[]> automatically look for <tt>myfile.png</tt> in the directory. </p><p> - If you want to create PostScript ouput, you will need to create an + If you want to create PostScript output, you will need to create an EPS version of your image file to be displayed in the PostScript file. There is a simple script available which allows you to change a PNG image into an EPS file diff --git a/tests/docbook/test/gdp-handbook.xml b/tests/docbook/test/gdp-handbook.xml index 6fe62531..f7cda69c 100644 --- a/tests/docbook/test/gdp-handbook.xml +++ b/tests/docbook/test/gdp-handbook.xml @@ -625,7 +625,7 @@ V1.1//EN"[]>]]> the directory. </para> <para> - If you want to create PostScript ouput, you will need to create an + If you want to create PostScript output, you will need to create an EPS version of your image file to be displayed in the PostScript file. There is a simple script available which allows you to change a PNG image into an EPS file diff --git a/tests/docs/Makefile.in b/tests/docs/Makefile.in index e809e0fa..bdb537a8 100644 --- a/tests/docs/Makefile.in +++ b/tests/docs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -152,6 +152,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -231,12 +232,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -246,6 +246,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -507,8 +508,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -532,7 +533,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/documents/Makefile.in b/tests/documents/Makefile.in index 46a76f26..8b85b1c6 100644 --- a/tests/documents/Makefile.in +++ b/tests/documents/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -323,8 +324,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -348,7 +349,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/exslt/Makefile.in b/tests/exslt/Makefile.in index 9e4e2ebc..a1286b89 100644 --- a/tests/exslt/Makefile.in +++ b/tests/exslt/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -131,7 +131,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -208,6 +208,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -287,12 +288,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -302,6 +302,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -376,8 +377,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -494,7 +495,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/exslt/common/Makefile.in b/tests/exslt/common/Makefile.in index fca17106..fb3aabcf 100644 --- a/tests/exslt/common/Makefile.in +++ b/tests/exslt/common/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -329,8 +330,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -354,7 +355,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/exslt/crypto/Makefile.in b/tests/exslt/crypto/Makefile.in index 2fc6b44a..8416fffc 100644 --- a/tests/exslt/crypto/Makefile.in +++ b/tests/exslt/crypto/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -320,8 +321,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -345,7 +346,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/exslt/date/Makefile.am b/tests/exslt/date/Makefile.am index 515f5496..fae16ab7 100644 --- a/tests/exslt/date/Makefile.am +++ b/tests/exslt/date/Makefile.am @@ -38,7 +38,7 @@ CLEANFILES = .memdump test-current: @(echo > .memdump) - @(if [ -z "$$CONTINUOUS_INTEGRATION" ]; then \ + @(if [ -z "$$CI" ]; then \ echo \<doc/\> >current.xml ; \ echo "#" ; \ echo "# Inspect the following for correctness" ; \ diff --git a/tests/exslt/date/Makefile.in b/tests/exslt/date/Makefile.in index 0ae8fcda..0061fbb8 100644 --- a/tests/exslt/date/Makefile.in +++ b/tests/exslt/date/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -347,8 +348,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -372,7 +373,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -525,7 +529,7 @@ $(top_builddir)/xsltproc/xsltproc: test-current: @(echo > .memdump) - @(if [ -z "$$CONTINUOUS_INTEGRATION" ]; then \ + @(if [ -z "$$CI" ]; then \ echo \<doc/\> >current.xml ; \ echo "#" ; \ echo "# Inspect the following for correctness" ; \ diff --git a/tests/exslt/date/duration.2.out b/tests/exslt/date/duration.2.out index 688b1768..87505d55 100644 --- a/tests/exslt/date/duration.2.out +++ b/tests/exslt/date/duration.2.out @@ -12,4 +12,6 @@ result : duration : P10Y10Y result : duration : P10.0Y +result : +duration : 9999999999999999999999999 result :
\ No newline at end of file diff --git a/tests/exslt/date/duration.2.xml b/tests/exslt/date/duration.2.xml index 5bc250e0..d81f21d2 100644 --- a/tests/exslt/date/duration.2.xml +++ b/tests/exslt/date/duration.2.xml @@ -8,5 +8,6 @@ <date seconds="P10Y10H"/> <date seconds="P10Y10Y"/> <date seconds="P10.0Y"/> + <date seconds="9999999999999999999999999"/> </page> diff --git a/tests/exslt/dynamic/Makefile.in b/tests/exslt/dynamic/Makefile.in index f2ef251a..57dd2a72 100644 --- a/tests/exslt/dynamic/Makefile.in +++ b/tests/exslt/dynamic/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -319,8 +320,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -344,7 +345,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/exslt/dynamic/dynmap.out b/tests/exslt/dynamic/dynmap.out index 7a900cae..ca81ace5 100644 --- a/tests/exslt/dynamic/dynmap.out +++ b/tests/exslt/dynamic/dynmap.out @@ -37,6 +37,7 @@ <exsl:string xmlns:exsl="http://exslt.org/common">without-child</exsl:string> <exsl:string xmlns:exsl="http://exslt.org/common">without-child</exsl:string> <exsl:string xmlns:exsl="http://exslt.org/common">with-child</exsl:string> + <exsl:string xmlns:exsl="http://exslt.org/common">&)</exsl:string> </string> <namespace> <exsl:string xmlns:exsl="http://exslt.org/common">dynmap</exsl:string> diff --git a/tests/exslt/dynamic/dynmap.xsl b/tests/exslt/dynamic/dynmap.xsl index 40f9eaf1..867e39a8 100644 --- a/tests/exslt/dynamic/dynmap.xsl +++ b/tests/exslt/dynamic/dynmap.xsl @@ -17,6 +17,7 @@ </number> <string> <xsl:copy-of select="dyn:map(*, 'name()')"/> + <xsl:copy-of select="dyn:map(., '"&)"')"/> </string> <namespace> <xsl:copy-of select="dyn:map(namespace::*, 'name(/*)')"/> diff --git a/tests/exslt/functions/Makefile.in b/tests/exslt/functions/Makefile.in index e5422ba2..681a07a0 100644 --- a/tests/exslt/functions/Makefile.in +++ b/tests/exslt/functions/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -329,8 +330,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -354,7 +355,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/exslt/math/Makefile.in b/tests/exslt/math/Makefile.in index 3b8ec9c2..50d5f7df 100644 --- a/tests/exslt/math/Makefile.in +++ b/tests/exslt/math/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -330,8 +331,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -355,7 +356,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/exslt/saxon/Makefile.in b/tests/exslt/saxon/Makefile.in index b1c2407c..fbe8894c 100644 --- a/tests/exslt/saxon/Makefile.in +++ b/tests/exslt/saxon/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -322,8 +323,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -347,7 +348,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/exslt/sets/Makefile.in b/tests/exslt/sets/Makefile.in index b4c9f02e..39ccb94e 100644 --- a/tests/exslt/sets/Makefile.in +++ b/tests/exslt/sets/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -323,8 +324,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -348,7 +349,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/exslt/strings/Makefile.in b/tests/exslt/strings/Makefile.in index 6c3eb785..4df41ae6 100644 --- a/tests/exslt/strings/Makefile.in +++ b/tests/exslt/strings/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -325,8 +326,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -350,7 +351,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/extensions/Makefile.in b/tests/extensions/Makefile.in index 7714f863..1e52fec4 100644 --- a/tests/extensions/Makefile.in +++ b/tests/extensions/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -321,8 +322,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -346,7 +347,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/fuzz/Makefile.am b/tests/fuzz/Makefile.am new file mode 100644 index 00000000..48e3e8cd --- /dev/null +++ b/tests/fuzz/Makefile.am @@ -0,0 +1,48 @@ +LIBXSLT_LIBS = $(top_builddir)/libxslt/libxslt.la \ + $(top_builddir)/libexslt/libexslt.la + +EXTRA_PROGRAMS = xpath xslt +check_PROGRAMS = testTargets +EXTRA_DIST = xpath.dict xpath.xml xslt.dict xslt.xml seed +CLEANFILES = $(EXTRA_PROGRAMS) +AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = $(LIBXML_CFLAGS) +DEPENDENCIES = $(LIBXSLT_LIBS) +LDADD = $(LIBXSLT_LIBS) \ + $(LIBGCRYPT_LIBS) $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) + +xpath_SOURCES = xpath.c fuzz.c fuzz.h +xpath_LDFLAGS = -fsanitize=fuzzer + +xslt_SOURCES = xslt.c fuzz.c fuzz.h +xslt_LDFLAGS = -fsanitize=fuzzer + +testTargets_SOURCES = testTargets.c fuzz.c fuzz.h + +$(top_builddir)/libxslt/libxslt.la: + cd $(top_builddir)/libxslt && $(MAKE) libxslt.la + +$(top_builddir)/libexslt/libexslt.la: $(top_builddir)/libxslt/libxslt.la + cd $(top_builddir)/libexslt && $(MAKE) libexslt.la + +.PHONY: tests fuzz-xpath fuzz-xslt + +tests: + +fuzz: $(check_PROGRAMS) + @echo '## Running fuzz target tests' + @./testTargets $(srcdir) + +fuzz-xpath: xpath$(EXEEXT) + @mkdir -p corpus/xpath + ./xpath$(EXEEXT) \ + -max_len=256 \ + -dict=$(srcdir)/xpath.dict \ + corpus/xpath $(srcdir)/seed/xpath + +fuzz-xslt: xslt$(EXEEXT) + @mkdir -p corpus/xslt + ./xslt$(EXEEXT) \ + -dict=$(srcdir)/xslt.dict \ + corpus/xslt $(srcdir)/seed/xslt + diff --git a/tests/fuzz/Makefile.in b/tests/fuzz/Makefile.in new file mode 100644 index 00000000..7768f893 --- /dev/null +++ b/tests/fuzz/Makefile.in @@ -0,0 +1,734 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +EXTRA_PROGRAMS = xpath$(EXEEXT) xslt$(EXEEXT) +check_PROGRAMS = testTargets$(EXEEXT) +subdir = tests/fuzz +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = xpath.xml xslt.xml +am_testTargets_OBJECTS = testTargets.$(OBJEXT) fuzz.$(OBJEXT) +testTargets_OBJECTS = $(am_testTargets_OBJECTS) +testTargets_LDADD = $(LDADD) +am__DEPENDENCIES_1 = +testTargets_DEPENDENCIES = $(LIBXSLT_LIBS) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +am_xpath_OBJECTS = xpath.$(OBJEXT) fuzz.$(OBJEXT) +xpath_OBJECTS = $(am_xpath_OBJECTS) +xpath_LDADD = $(LDADD) +xpath_DEPENDENCIES = $(LIBXSLT_LIBS) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +xpath_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(xpath_LDFLAGS) $(LDFLAGS) -o $@ +am_xslt_OBJECTS = xslt.$(OBJEXT) fuzz.$(OBJEXT) +xslt_OBJECTS = $(am_xslt_OBJECTS) +xslt_LDADD = $(LDADD) +xslt_DEPENDENCIES = $(LIBXSLT_LIBS) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +xslt_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(xslt_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/fuzz.Po ./$(DEPDIR)/testTargets.Po \ + ./$(DEPDIR)/xpath.Po ./$(DEPDIR)/xslt.Po +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(testTargets_SOURCES) $(xpath_SOURCES) $(xslt_SOURCES) +DIST_SOURCES = $(testTargets_SOURCES) $(xpath_SOURCES) $(xslt_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/xpath.xml \ + $(srcdir)/xslt.xml $(top_srcdir)/depcomp README +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CRYPTO_TESTDIR = @CRYPTO_TESTDIR@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ +EXSLT_LIBDIR = @EXSLT_LIBDIR@ +EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ +EXTRA_LIBS = @EXTRA_LIBS@ +FGREP = @FGREP@ +GREP = @GREP@ +HTML_DIR = @HTML_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBEXSLT_MAJOR_VERSION = @LIBEXSLT_MAJOR_VERSION@ +LIBEXSLT_MICRO_VERSION = @LIBEXSLT_MICRO_VERSION@ +LIBEXSLT_MINOR_VERSION = @LIBEXSLT_MINOR_VERSION@ +LIBEXSLT_VERSION = @LIBEXSLT_VERSION@ +LIBEXSLT_VERSION_EXTRA = @LIBEXSLT_VERSION_EXTRA@ +LIBEXSLT_VERSION_INFO = @LIBEXSLT_VERSION_INFO@ +LIBEXSLT_VERSION_NUMBER = @LIBEXSLT_VERSION_NUMBER@ +LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ +LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ +LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIBXML_CFLAGS = @LIBXML_CFLAGS@ +LIBXML_LIBS = @LIBXML_LIBS@ +LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@ +LIBXML_SRC = @LIBXML_SRC@ +LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@ +LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@ +LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@ +LIBXSLT_MICRO_VERSION = @LIBXSLT_MICRO_VERSION@ +LIBXSLT_MINOR_VERSION = @LIBXSLT_MINOR_VERSION@ +LIBXSLT_VERSION = @LIBXSLT_VERSION@ +LIBXSLT_VERSION_EXTRA = @LIBXSLT_VERSION_EXTRA@ +LIBXSLT_VERSION_INFO = @LIBXSLT_VERSION_INFO@ +LIBXSLT_VERSION_NUMBER = @LIBXSLT_VERSION_NUMBER@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +M_LIBS = @M_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PYTHON = @PYTHON@ +PYTHONSODV = @PYTHONSODV@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ +PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@ +PYTHON_SUBDIR = @PYTHON_SUBDIR@ +PYTHON_VERSION = @PYTHON_VERSION@ +RANLIB = @RANLIB@ +RELDATE = @RELDATE@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +THREAD_LIBS = @THREAD_LIBS@ +VERSION = @VERSION@ +VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ +WITH_CRYPTO = @WITH_CRYPTO@ +WITH_DEBUGGER = @WITH_DEBUGGER@ +WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ +WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ +WITH_TRIO = @WITH_TRIO@ +WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ +XMLLINT = @XMLLINT@ +XML_CONFIG = @XML_CONFIG@ +XSLTPROC = @XSLTPROC@ +XSLTPROCDV = @XSLTPROCDV@ +XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ +XSLT_LIBDIR = @XSLT_LIBDIR@ +XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +LIBXSLT_LIBS = $(top_builddir)/libxslt/libxslt.la \ + $(top_builddir)/libexslt/libexslt.la + +EXTRA_DIST = xpath.dict xpath.xml xslt.dict xslt.xml seed +CLEANFILES = $(EXTRA_PROGRAMS) +AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = $(LIBXML_CFLAGS) +DEPENDENCIES = $(LIBXSLT_LIBS) +LDADD = $(LIBXSLT_LIBS) \ + $(LIBGCRYPT_LIBS) $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) + +xpath_SOURCES = xpath.c fuzz.c fuzz.h +xpath_LDFLAGS = -fsanitize=fuzzer +xslt_SOURCES = xslt.c fuzz.c fuzz.h +xslt_LDFLAGS = -fsanitize=fuzzer +testTargets_SOURCES = testTargets.c fuzz.c fuzz.h +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/fuzz/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign tests/fuzz/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +testTargets$(EXEEXT): $(testTargets_OBJECTS) $(testTargets_DEPENDENCIES) $(EXTRA_testTargets_DEPENDENCIES) + @rm -f testTargets$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(testTargets_OBJECTS) $(testTargets_LDADD) $(LIBS) + +xpath$(EXEEXT): $(xpath_OBJECTS) $(xpath_DEPENDENCIES) $(EXTRA_xpath_DEPENDENCIES) + @rm -f xpath$(EXEEXT) + $(AM_V_CCLD)$(xpath_LINK) $(xpath_OBJECTS) $(xpath_LDADD) $(LIBS) + +xslt$(EXEEXT): $(xslt_OBJECTS) $(xslt_DEPENDENCIES) $(EXTRA_xslt_DEPENDENCIES) + @rm -f xslt$(EXEEXT) + $(AM_V_CCLD)$(xslt_LINK) $(xslt_OBJECTS) $(xslt_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fuzz.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testTargets.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xpath.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xslt.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/fuzz.Po + -rm -f ./$(DEPDIR)/testTargets.Po + -rm -f ./$(DEPDIR)/xpath.Po + -rm -f ./$(DEPDIR)/xslt.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/fuzz.Po + -rm -f ./$(DEPDIR)/testTargets.Po + -rm -f ./$(DEPDIR)/xpath.Po + -rm -f ./$(DEPDIR)/xslt.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: check-am install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +$(top_builddir)/libxslt/libxslt.la: + cd $(top_builddir)/libxslt && $(MAKE) libxslt.la + +$(top_builddir)/libexslt/libexslt.la: $(top_builddir)/libxslt/libxslt.la + cd $(top_builddir)/libexslt && $(MAKE) libexslt.la + +.PHONY: tests fuzz-xpath fuzz-xslt + +tests: + +fuzz: $(check_PROGRAMS) + @echo '## Running fuzz target tests' + @./testTargets $(srcdir) + +fuzz-xpath: xpath$(EXEEXT) + @mkdir -p corpus/xpath + ./xpath$(EXEEXT) \ + -max_len=256 \ + -dict=$(srcdir)/xpath.dict \ + corpus/xpath $(srcdir)/seed/xpath + +fuzz-xslt: xslt$(EXEEXT) + @mkdir -p corpus/xslt + ./xslt$(EXEEXT) \ + -dict=$(srcdir)/xslt.dict \ + corpus/xslt $(srcdir)/seed/xslt + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/tests/fuzz/README b/tests/fuzz/README new file mode 100644 index 00000000..804ea124 --- /dev/null +++ b/tests/fuzz/README @@ -0,0 +1,29 @@ +libFuzzer instructions for libxslt +================================== + +Set compiler and options. Disable float-divide-by-zero and pointer-overflow +sanitizers when using UBSan. + + export CC=clang + export CFLAGS="-g -fsanitize=fuzzer-no-link,address,undefined \ + -fno-sanitize=float-divide-by-zero,pointer-overflow \ + -fno-sanitize-recover=all \ + -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" + +Build libxml2 with instrumentation: + + cd /path/to/libxml2 + ./configure --without-python + make + +Build libxslt with instrumentation: + + cd /path/to/libxslt + ./configure --without-python --with-libxml-src=/path/to/libxml2 + make + +Run fuzzers: + + make -C tests/fuzz fuzz-xslt + make -C tests/fuzz fuzz-xpath + diff --git a/tests/fuzz/fuzz.c b/tests/fuzz/fuzz.c new file mode 100644 index 00000000..d862242c --- /dev/null +++ b/tests/fuzz/fuzz.c @@ -0,0 +1,371 @@ +/* + * fuzz.c: Fuzz targets for libxslt + * + * See Copyright for the status of this software. + */ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> + +#include "fuzz.h" + +#include <libxml/tree.h> +#include <libxml/parser.h> +#include <libxml/xpath.h> +#include <libxml/xpathInternals.h> +#include <libxslt/extensions.h> +#include <libxslt/functions.h> +#include <libxslt/security.h> +#include <libxslt/transform.h> +#include <libxslt/xslt.h> +#include <libxslt/xsltInternals.h> +#include <libxslt/xsltutils.h> +#include <libexslt/exslt.h> + +#if defined(_WIN32) + #define DIR_SEP '\\' +#else + #define DIR_SEP '/' +#endif + +static xmlDocPtr doc; +static xsltSecurityPrefsPtr sec; +static xsltTransformContextPtr tctxt; +static xmlHashTablePtr saxonExtHash; + +static void +xsltFuzzXmlErrorFunc(void *vctxt, const char *msg ATTRIBUTE_UNUSED, ...) { + xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) vctxt; + /* + * Stopping the parser should be slightly faster and might catch some + * issues related to recent libxml2 changes. + */ + xmlStopParser(ctxt); +} + +static void +xsltFuzzXsltErrorFunc(void *vctxt ATTRIBUTE_UNUSED, + const char *msg ATTRIBUTE_UNUSED, ...) { +} + +static void +xsltFuzzInit(void) { + /* Init libxml2, libxslt and libexslt */ + xmlInitParser(); + xmlXPathInit(); + xsltInit(); + exsltRegisterAll(); + + /* Suppress error messages */ + xmlSetGenericErrorFunc(NULL, xsltFuzzXmlErrorFunc); + xsltSetGenericErrorFunc(NULL, xsltFuzzXsltErrorFunc); + + /* Disallow I/O */ + sec = xsltNewSecurityPrefs(); + xsltSetSecurityPrefs(sec, XSLT_SECPREF_READ_FILE, xsltSecurityForbid); + xsltSetSecurityPrefs(sec, XSLT_SECPREF_WRITE_FILE, xsltSecurityForbid); + xsltSetSecurityPrefs(sec, XSLT_SECPREF_CREATE_DIRECTORY, xsltSecurityForbid); + xsltSetSecurityPrefs(sec, XSLT_SECPREF_READ_NETWORK, xsltSecurityForbid); + xsltSetSecurityPrefs(sec, XSLT_SECPREF_WRITE_NETWORK, xsltSecurityForbid); +} + +static xmlDocPtr +xsltFuzzLoadDoc(const char *argv0, const char *dir, const char *filename) { + char *path; + + if (dir != NULL) { + path = malloc(strlen(dir) + 1 + strlen(filename) + 1); + sprintf(path, "%s/%s", dir, filename); + } else { + const char *end; + size_t dirLen; + + end = strrchr(argv0, DIR_SEP); + dirLen = (end == NULL) ? 0 : end - argv0 + 1; + path = malloc(dirLen + strlen(filename) + 1); + memcpy(path, argv0, dirLen); + path[dirLen] = '\0'; + strcat(path, filename); + } + + doc = xmlReadFile(path, NULL, 0); + if (doc == NULL) + fprintf(stderr, "Error: unable to parse file '%s'\n", path); + free(path); + + return doc; +} + +/* XPath fuzzer + * + * This fuzz target parses and evaluates XPath expressions in an (E)XSLT + * context using a static XML document. It heavily exercises the libxml2 + * XPath engine (xpath.c), a few other parts of libxml2, and most of + * libexslt. + * + * Some EXSLT functions need the transform context to create RVTs for + * node-sets. A couple of functions also access the stylesheet. The + * XPath context from the transform context is used to parse and + * evaluate expressions. + * + * All these objects are created once at startup. After fuzzing each input, + * they're reset as cheaply as possible. + * + * TODO + * + * - Some expressions can create lots of temporary node sets (RVTs) which + * aren't freed until the whole expression was evaluated, leading to + * extensive memory usage. Cleaning them up earlier would require + * callbacks from the XPath engine, for example after evaluating a + * predicate expression, which doesn't seem feasible. Terminating the + * evaluation after creating a certain number of RVTs is a simple + * workaround. + * - Register a custom xsl:decimal-format declaration for format-number(). + * - Some functions add strings to the stylesheet or transform context + * dictionary, for example via xsltGetQName, requiring a clean up of the + * dicts after fuzzing each input. This behavior seems questionable. + * Extension functions shouldn't needlessly modify the transform context + * or stylesheet. + * - Register xsl:keys and fuzz the key() function. + * - Add a few custom func:functions. + * - Fuzz the document() function with external documents. + */ + +int +xsltFuzzXPathInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p, + const char *dir) { + const char *xmlFilename = "xpath.xml"; + xsltStylesheetPtr style; + xmlXPathContextPtr xpctxt; + + xsltFuzzInit(); + + /* Load XML document */ + doc = xsltFuzzLoadDoc((*argv_p)[0], dir, xmlFilename); + if (doc == NULL) + return -1; + + style = xsltNewStylesheet(); + tctxt = xsltNewTransformContext(style, doc); + xsltSetCtxtSecurityPrefs(sec, tctxt); + + /* + * Some extension functions need the current instruction. + * + * - format-number() for namespaces. + * - document() for the base URL. + * - maybe others? + * + * For fuzzing, it's enough to use the source document's root element. + */ + tctxt->inst = xmlDocGetRootElement(doc); + + saxonExtHash = (xmlHashTablePtr) + xsltStyleGetExtData(style, SAXON_NAMESPACE); + + /* Set up XPath context */ + xpctxt = tctxt->xpathCtxt; + + /* Resource limits to avoid timeouts and call stack overflows */ + xpctxt->maxParserDepth = 15; + xpctxt->maxDepth = 100; + xpctxt->opLimit = 500000; + + /* Test namespaces used in xpath.xml */ + xmlXPathRegisterNs(xpctxt, BAD_CAST "a", BAD_CAST "a"); + xmlXPathRegisterNs(xpctxt, BAD_CAST "b", BAD_CAST "b"); + xmlXPathRegisterNs(xpctxt, BAD_CAST "c", BAD_CAST "c"); + + /* EXSLT namespaces */ + xmlXPathRegisterNs(xpctxt, BAD_CAST "crypto", EXSLT_CRYPTO_NAMESPACE); + xmlXPathRegisterNs(xpctxt, BAD_CAST "date", EXSLT_DATE_NAMESPACE); + xmlXPathRegisterNs(xpctxt, BAD_CAST "dyn", EXSLT_DYNAMIC_NAMESPACE); + xmlXPathRegisterNs(xpctxt, BAD_CAST "exsl", EXSLT_COMMON_NAMESPACE); + xmlXPathRegisterNs(xpctxt, BAD_CAST "math", EXSLT_MATH_NAMESPACE); + xmlXPathRegisterNs(xpctxt, BAD_CAST "saxon", SAXON_NAMESPACE); + xmlXPathRegisterNs(xpctxt, BAD_CAST "set", EXSLT_SETS_NAMESPACE); + xmlXPathRegisterNs(xpctxt, BAD_CAST "str", EXSLT_STRINGS_NAMESPACE); + + /* Register variables */ + xmlXPathRegisterVariable(xpctxt, BAD_CAST "f", xmlXPathNewFloat(-1.5)); + xmlXPathRegisterVariable(xpctxt, BAD_CAST "b", xmlXPathNewBoolean(1)); + xmlXPathRegisterVariable(xpctxt, BAD_CAST "s", + xmlXPathNewString(BAD_CAST "var")); + xmlXPathRegisterVariable( + xpctxt, BAD_CAST "n", + xmlXPathEval(BAD_CAST "//node() | /*/*/namespace::*", xpctxt)); + + return 0; +} + +xmlXPathObjectPtr +xsltFuzzXPath(const char *data, size_t size) { + xmlXPathContextPtr xpctxt = tctxt->xpathCtxt; + xmlChar *xpathExpr; + + /* Null-terminate */ + xpathExpr = malloc(size + 1); + memcpy(xpathExpr, data, size); + xpathExpr[size] = 0; + + /* Compile and return early if the expression is invalid */ + xmlXPathCompExprPtr compExpr = xmlXPathCtxtCompile(xpctxt, xpathExpr); + free(xpathExpr); + if (compExpr == NULL) + return NULL; + + /* Initialize XPath evaluation context and evaluate */ + xpctxt->node = (xmlNodePtr) doc; /* Maybe test different context nodes? */ + xpctxt->contextSize = 1; + xpctxt->proximityPosition = 1; + xpctxt->opCount = 0; + xmlXPathObjectPtr xpathObj = xmlXPathCompiledEval(compExpr, xpctxt); + xmlXPathFreeCompExpr(compExpr); + + /* Clean object cache */ + xmlXPathContextSetCache(xpctxt, 0, 0, 0); + xmlXPathContextSetCache(xpctxt, 1, -1, 0); + + /* Clean dictionaries */ + if (xmlDictSize(tctxt->dict) > 0) { + xmlDictFree(tctxt->dict); + xmlDictFree(tctxt->style->dict); + tctxt->style->dict = xmlDictCreate(); + tctxt->dict = xmlDictCreateSub(tctxt->style->dict); + } + + /* Clean saxon:expression cache */ + if (xmlHashSize(saxonExtHash) > 0) { + /* There doesn't seem to be a cheaper way with the public API. */ + xsltShutdownCtxtExts(tctxt); + xsltInitCtxtExts(tctxt); + saxonExtHash = (xmlHashTablePtr) + xsltStyleGetExtData(tctxt->style, SAXON_NAMESPACE); + } + + return xpathObj; +} + +void +xsltFuzzXPathFreeObject(xmlXPathObjectPtr obj) { + xmlXPathFreeObject(obj); + + /* Some XSLT extension functions create RVTs. */ + xsltFreeRVTs(tctxt); +} + +void +xsltFuzzXPathCleanup(void) { + xsltStylesheetPtr style = tctxt->style; + + xmlXPathRegisteredNsCleanup(tctxt->xpathCtxt); + xsltFreeSecurityPrefs(sec); + sec = NULL; + xsltFreeTransformContext(tctxt); + tctxt = NULL; + xsltFreeStylesheet(style); + style = NULL; + xmlFreeDoc(doc); + doc = NULL; +} + +/* + * XSLT fuzzer + * + * This is a rather naive fuzz target using a static XML document. + * + * TODO + * + * - Improve seed corpus + * - Mutate multiple input documents: source, xsl:import, xsl:include + * - format-number() with xsl:decimal-format + * - Better coverage for xsl:key and key() function + * - EXSLT func:function + * - xsl:document + */ + +int +xsltFuzzXsltInit(int *argc_p ATTRIBUTE_UNUSED, char ***argv_p, + const char *dir) { + const char *xmlFilename = "xslt.xml"; + + xsltFuzzInit(); + + /* Load XML document */ + doc = xsltFuzzLoadDoc((*argv_p)[0], dir, xmlFilename); + if (doc == NULL) + return -1; + + return 0; +} + +static void +xsltSetXPathResourceLimits(xmlXPathContextPtr ctxt) { + ctxt->maxParserDepth = 15; + ctxt->maxDepth = 100; + ctxt->opLimit = 100000; +} + +xmlChar * +xsltFuzzXslt(const char *data, size_t size) { + xmlDocPtr xsltDoc; + xmlDocPtr result; + xmlNodePtr xsltRoot; + xsltStylesheetPtr sheet; + xsltTransformContextPtr ctxt; + xmlChar *ret = NULL; + int retLen; + + xsltDoc = xmlReadMemory(data, size, NULL, NULL, 0); + if (xsltDoc == NULL) + return NULL; + xsltRoot = xmlDocGetRootElement(xsltDoc); + xmlNewNs(xsltRoot, EXSLT_COMMON_NAMESPACE, BAD_CAST "exsl"); + xmlNewNs(xsltRoot, EXSLT_COMMON_NAMESPACE, BAD_CAST "exslt"); + xmlNewNs(xsltRoot, EXSLT_CRYPTO_NAMESPACE, BAD_CAST "crypto"); + xmlNewNs(xsltRoot, EXSLT_DATE_NAMESPACE, BAD_CAST "date"); + xmlNewNs(xsltRoot, EXSLT_DYNAMIC_NAMESPACE, BAD_CAST "dyn"); + xmlNewNs(xsltRoot, EXSLT_MATH_NAMESPACE, BAD_CAST "math"); + xmlNewNs(xsltRoot, EXSLT_SETS_NAMESPACE, BAD_CAST "set"); + xmlNewNs(xsltRoot, EXSLT_STRINGS_NAMESPACE, BAD_CAST "str"); + xmlNewNs(xsltRoot, SAXON_NAMESPACE, BAD_CAST "saxon"); + + sheet = xsltNewStylesheet(); + if (sheet == NULL) { + xmlFreeDoc(xsltDoc); + return NULL; + } + xsltSetXPathResourceLimits(sheet->xpathCtxt); + sheet->xpathCtxt->opCount = 0; + if (xsltParseStylesheetUser(sheet, xsltDoc) != 0) { + xsltFreeStylesheet(sheet); + xmlFreeDoc(xsltDoc); + return NULL; + } + + ctxt = xsltNewTransformContext(sheet, doc); + xsltSetCtxtSecurityPrefs(sec, ctxt); + ctxt->maxTemplateDepth = 100; + ctxt->opLimit = 20000; + xsltSetXPathResourceLimits(ctxt->xpathCtxt); + ctxt->xpathCtxt->opCount = sheet->xpathCtxt->opCount; + + result = xsltApplyStylesheetUser(sheet, doc, NULL, NULL, NULL, ctxt); + if (result != NULL) + xsltSaveResultToString(&ret, &retLen, result, sheet); + + xmlFreeDoc(result); + xsltFreeTransformContext(ctxt); + xsltFreeStylesheet(sheet); + + return ret; +} + +void +xsltFuzzXsltCleanup(void) { + xsltFreeSecurityPrefs(sec); + sec = NULL; + xmlFreeDoc(doc); + doc = NULL; +} diff --git a/tests/fuzz/fuzz.h b/tests/fuzz/fuzz.h new file mode 100644 index 00000000..7dff3dbe --- /dev/null +++ b/tests/fuzz/fuzz.h @@ -0,0 +1,35 @@ +/* + * xpath.h: Header for fuzz targets + * + * See Copyright for the status of this software. + */ + +#ifndef __XML_XSLT_TESTS_FUZZ_H__ +#define __XML_XSLT_TESTS_FUZZ_H__ + +#include <stddef.h> +#include <libxml/xmlstring.h> +#include <libxml/xpath.h> + +int +xsltFuzzXPathInit(int *argc_p, char ***argv_p, const char *dir); + +xmlXPathObjectPtr +xsltFuzzXPath(const char *data, size_t size); + +void +xsltFuzzXPathFreeObject(xmlXPathObjectPtr obj); + +void +xsltFuzzXPathCleanup(void); + +int +xsltFuzzXsltInit(int *argc_p, char ***argv_p, const char *dir); + +xmlChar * +xsltFuzzXslt(const char *data, size_t size); + +void +xsltFuzzXsltCleanup(void); + +#endif diff --git a/tests/fuzz/seed/xpath/crypto_md4 b/tests/fuzz/seed/xpath/crypto_md4 new file mode 100644 index 00000000..af26aed1 --- /dev/null +++ b/tests/fuzz/seed/xpath/crypto_md4 @@ -0,0 +1 @@ +crypto:md4('a') diff --git a/tests/fuzz/seed/xpath/crypto_md5 b/tests/fuzz/seed/xpath/crypto_md5 new file mode 100644 index 00000000..e0af6d39 --- /dev/null +++ b/tests/fuzz/seed/xpath/crypto_md5 @@ -0,0 +1 @@ +crypto:md5('a') diff --git a/tests/fuzz/seed/xpath/crypto_rc4_decrypt b/tests/fuzz/seed/xpath/crypto_rc4_decrypt new file mode 100644 index 00000000..fe346720 --- /dev/null +++ b/tests/fuzz/seed/xpath/crypto_rc4_decrypt @@ -0,0 +1 @@ +crypto:rc4_decrypt(crypto:rc4_encrypt('key','msg')) diff --git a/tests/fuzz/seed/xpath/crypto_sha1 b/tests/fuzz/seed/xpath/crypto_sha1 new file mode 100644 index 00000000..a139200d --- /dev/null +++ b/tests/fuzz/seed/xpath/crypto_sha1 @@ -0,0 +1 @@ +crypto:sha1('a') diff --git a/tests/fuzz/seed/xpath/date_add b/tests/fuzz/seed/xpath/date_add new file mode 100644 index 00000000..e12bd62c --- /dev/null +++ b/tests/fuzz/seed/xpath/date_add @@ -0,0 +1 @@ +date:add('2016-01-01T12:00:00','-P1Y2M3DT10H30M45S') diff --git a/tests/fuzz/seed/xpath/date_add_duration b/tests/fuzz/seed/xpath/date_add_duration new file mode 100644 index 00000000..3add82f3 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_add_duration @@ -0,0 +1 @@ +date:add-duration('-P1Y2M3DT10H30M45S','-P1Y2M3DT10H30M45S') diff --git a/tests/fuzz/seed/xpath/date_date b/tests/fuzz/seed/xpath/date_date new file mode 100644 index 00000000..db7eb0fb --- /dev/null +++ b/tests/fuzz/seed/xpath/date_date @@ -0,0 +1 @@ +date:date('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_date_time b/tests/fuzz/seed/xpath/date_date_time new file mode 100644 index 00000000..56c80c79 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_date_time @@ -0,0 +1 @@ +date:date-time() diff --git a/tests/fuzz/seed/xpath/date_day_abbreviation b/tests/fuzz/seed/xpath/date_day_abbreviation new file mode 100644 index 00000000..ea19a5d4 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_day_abbreviation @@ -0,0 +1 @@ +date:day-abbreviation('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_day_in_month b/tests/fuzz/seed/xpath/date_day_in_month new file mode 100644 index 00000000..2b21b611 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_day_in_month @@ -0,0 +1 @@ +date:day-in-month('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_day_in_week b/tests/fuzz/seed/xpath/date_day_in_week new file mode 100644 index 00000000..78343b04 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_day_in_week @@ -0,0 +1 @@ +date:day-in-week('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_day_in_year b/tests/fuzz/seed/xpath/date_day_in_year new file mode 100644 index 00000000..32e55743 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_day_in_year @@ -0,0 +1 @@ +date:day-in-year('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_day_name b/tests/fuzz/seed/xpath/date_day_name new file mode 100644 index 00000000..69d66aee --- /dev/null +++ b/tests/fuzz/seed/xpath/date_day_name @@ -0,0 +1 @@ +date:day-name('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_day_of_week_in_month b/tests/fuzz/seed/xpath/date_day_of_week_in_month new file mode 100644 index 00000000..e2525bd7 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_day_of_week_in_month @@ -0,0 +1 @@ +date:day-of-week-in-month('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_difference b/tests/fuzz/seed/xpath/date_difference new file mode 100644 index 00000000..deb5b9d1 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_difference @@ -0,0 +1 @@ +date:difference('1999-06-10T20:03:48','2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_duration b/tests/fuzz/seed/xpath/date_duration new file mode 100644 index 00000000..1c8f4acb --- /dev/null +++ b/tests/fuzz/seed/xpath/date_duration @@ -0,0 +1 @@ +date:duration('1234567890') diff --git a/tests/fuzz/seed/xpath/date_format_date b/tests/fuzz/seed/xpath/date_format_date new file mode 100644 index 00000000..7025e1d5 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_format_date @@ -0,0 +1 @@ +date:format-date('2016-01-01T12:00:00','GyyyyMMwwWWDDddFFEaHHkkKKhhMMssSSSzZ') diff --git a/tests/fuzz/seed/xpath/date_hour_in_day b/tests/fuzz/seed/xpath/date_hour_in_day new file mode 100644 index 00000000..68ed1f00 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_hour_in_day @@ -0,0 +1 @@ +date:hour-in-day('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_leap_year b/tests/fuzz/seed/xpath/date_leap_year new file mode 100644 index 00000000..4f7b98da --- /dev/null +++ b/tests/fuzz/seed/xpath/date_leap_year @@ -0,0 +1 @@ +date:leap-year('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_minute_in_hour b/tests/fuzz/seed/xpath/date_minute_in_hour new file mode 100644 index 00000000..865fbc25 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_minute_in_hour @@ -0,0 +1 @@ +date:minute-in-hour('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_month_abbreviation b/tests/fuzz/seed/xpath/date_month_abbreviation new file mode 100644 index 00000000..89a2e2c4 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_month_abbreviation @@ -0,0 +1 @@ +date:month-abbreviation('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_month_in_year b/tests/fuzz/seed/xpath/date_month_in_year new file mode 100644 index 00000000..07c0c12d --- /dev/null +++ b/tests/fuzz/seed/xpath/date_month_in_year @@ -0,0 +1 @@ +date:month-in-year('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_month_name b/tests/fuzz/seed/xpath/date_month_name new file mode 100644 index 00000000..7da78e79 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_month_name @@ -0,0 +1 @@ +date:month-name('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_parse_date b/tests/fuzz/seed/xpath/date_parse_date new file mode 100644 index 00000000..cea782cc --- /dev/null +++ b/tests/fuzz/seed/xpath/date_parse_date @@ -0,0 +1 @@ +date:parse-date('20160101120000','yyyyMMddkkmmss') diff --git a/tests/fuzz/seed/xpath/date_second_in_minute b/tests/fuzz/seed/xpath/date_second_in_minute new file mode 100644 index 00000000..2574fa74 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_second_in_minute @@ -0,0 +1 @@ +date:second-in-minute('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_seconds b/tests/fuzz/seed/xpath/date_seconds new file mode 100644 index 00000000..48ec1c2a --- /dev/null +++ b/tests/fuzz/seed/xpath/date_seconds @@ -0,0 +1 @@ +date:seconds('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_sum b/tests/fuzz/seed/xpath/date_sum new file mode 100644 index 00000000..39500251 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_sum @@ -0,0 +1 @@ +date:sum(str:split('-P1Y2M3DT10H30M45S,-P1Y2M3DT10H30M45S,P999999999S',',')) diff --git a/tests/fuzz/seed/xpath/date_time b/tests/fuzz/seed/xpath/date_time new file mode 100644 index 00000000..3333638c --- /dev/null +++ b/tests/fuzz/seed/xpath/date_time @@ -0,0 +1 @@ +date:time('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_week_in_month b/tests/fuzz/seed/xpath/date_week_in_month new file mode 100644 index 00000000..415ed927 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_week_in_month @@ -0,0 +1 @@ +date:week-in-month('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_week_in_year b/tests/fuzz/seed/xpath/date_week_in_year new file mode 100644 index 00000000..baf0c2cd --- /dev/null +++ b/tests/fuzz/seed/xpath/date_week_in_year @@ -0,0 +1 @@ +date:week-in-year('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/date_year b/tests/fuzz/seed/xpath/date_year new file mode 100644 index 00000000..b615fde4 --- /dev/null +++ b/tests/fuzz/seed/xpath/date_year @@ -0,0 +1 @@ +date:year('2016-01-01T12:00:00') diff --git a/tests/fuzz/seed/xpath/dyn_evaluate b/tests/fuzz/seed/xpath/dyn_evaluate new file mode 100644 index 00000000..cb0f284b --- /dev/null +++ b/tests/fuzz/seed/xpath/dyn_evaluate @@ -0,0 +1 @@ +dyn:evaluate('1+1') diff --git a/tests/fuzz/seed/xpath/dyn_map b/tests/fuzz/seed/xpath/dyn_map new file mode 100644 index 00000000..361ddb39 --- /dev/null +++ b/tests/fuzz/seed/xpath/dyn_map @@ -0,0 +1 @@ +dyn:map(//*,'.') diff --git a/tests/fuzz/seed/xpath/expr_arith b/tests/fuzz/seed/xpath/expr_arith new file mode 100644 index 00000000..bc4813df --- /dev/null +++ b/tests/fuzz/seed/xpath/expr_arith @@ -0,0 +1 @@ +(1.1+-24.5)*0.8-(25div3.5)mod0.2 diff --git a/tests/fuzz/seed/xpath/expr_location_path b/tests/fuzz/seed/xpath/expr_location_path new file mode 100644 index 00000000..789255c2 --- /dev/null +++ b/tests/fuzz/seed/xpath/expr_location_path @@ -0,0 +1 @@ +/a/b/c/text()|//e/c:d/@b diff --git a/tests/fuzz/seed/xpath/expr_predicate b/tests/fuzz/seed/xpath/expr_predicate new file mode 100644 index 00000000..191b3051 --- /dev/null +++ b/tests/fuzz/seed/xpath/expr_predicate @@ -0,0 +1 @@ +(//*[@*][1])[1] diff --git a/tests/fuzz/seed/xpath/exsl_node_set_1 b/tests/fuzz/seed/xpath/exsl_node_set_1 new file mode 100644 index 00000000..a27992a5 --- /dev/null +++ b/tests/fuzz/seed/xpath/exsl_node_set_1 @@ -0,0 +1 @@ +exsl:node-set($n) diff --git a/tests/fuzz/seed/xpath/exsl_node_set_2 b/tests/fuzz/seed/xpath/exsl_node_set_2 new file mode 100644 index 00000000..10b276c5 --- /dev/null +++ b/tests/fuzz/seed/xpath/exsl_node_set_2 @@ -0,0 +1 @@ +exsl:node-set('s') diff --git a/tests/fuzz/seed/xpath/exsl_object_type b/tests/fuzz/seed/xpath/exsl_object_type new file mode 100644 index 00000000..2a3784a2 --- /dev/null +++ b/tests/fuzz/seed/xpath/exsl_object_type @@ -0,0 +1 @@ +exsl:object-type(1) diff --git a/tests/fuzz/seed/xpath/func_boolean b/tests/fuzz/seed/xpath/func_boolean new file mode 100644 index 00000000..409bec66 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_boolean @@ -0,0 +1 @@ +boolean(.) diff --git a/tests/fuzz/seed/xpath/func_ceiling b/tests/fuzz/seed/xpath/func_ceiling new file mode 100644 index 00000000..f23305db --- /dev/null +++ b/tests/fuzz/seed/xpath/func_ceiling @@ -0,0 +1 @@ +ceiling(.) diff --git a/tests/fuzz/seed/xpath/func_concat b/tests/fuzz/seed/xpath/func_concat new file mode 100644 index 00000000..b6c9a1b1 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_concat @@ -0,0 +1 @@ +concat(.,'a') diff --git a/tests/fuzz/seed/xpath/func_contains b/tests/fuzz/seed/xpath/func_contains new file mode 100644 index 00000000..ed18a39c --- /dev/null +++ b/tests/fuzz/seed/xpath/func_contains @@ -0,0 +1 @@ +contains(.,'e') diff --git a/tests/fuzz/seed/xpath/func_count b/tests/fuzz/seed/xpath/func_count new file mode 100644 index 00000000..3fea95c0 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_count @@ -0,0 +1 @@ +count(.) diff --git a/tests/fuzz/seed/xpath/func_false b/tests/fuzz/seed/xpath/func_false new file mode 100644 index 00000000..f9e9b505 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_false @@ -0,0 +1 @@ +false() diff --git a/tests/fuzz/seed/xpath/func_floor b/tests/fuzz/seed/xpath/func_floor new file mode 100644 index 00000000..6c0d2db0 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_floor @@ -0,0 +1 @@ +floor(.) diff --git a/tests/fuzz/seed/xpath/func_id b/tests/fuzz/seed/xpath/func_id new file mode 100644 index 00000000..9c29ea0d --- /dev/null +++ b/tests/fuzz/seed/xpath/func_id @@ -0,0 +1 @@ +id(.) diff --git a/tests/fuzz/seed/xpath/func_lang b/tests/fuzz/seed/xpath/func_lang new file mode 100644 index 00000000..1ff69fd2 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_lang @@ -0,0 +1 @@ +lang(.) diff --git a/tests/fuzz/seed/xpath/func_last b/tests/fuzz/seed/xpath/func_last new file mode 100644 index 00000000..06e7e03f --- /dev/null +++ b/tests/fuzz/seed/xpath/func_last @@ -0,0 +1 @@ +last() diff --git a/tests/fuzz/seed/xpath/func_local_name b/tests/fuzz/seed/xpath/func_local_name new file mode 100644 index 00000000..1a0193b3 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_local_name @@ -0,0 +1 @@ +local-name(.) diff --git a/tests/fuzz/seed/xpath/func_name b/tests/fuzz/seed/xpath/func_name new file mode 100644 index 00000000..6bce7bf5 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_name @@ -0,0 +1 @@ +name(.) diff --git a/tests/fuzz/seed/xpath/func_namespace_uri b/tests/fuzz/seed/xpath/func_namespace_uri new file mode 100644 index 00000000..649a382c --- /dev/null +++ b/tests/fuzz/seed/xpath/func_namespace_uri @@ -0,0 +1 @@ +namespace-uri(.) diff --git a/tests/fuzz/seed/xpath/func_normalize_space b/tests/fuzz/seed/xpath/func_normalize_space new file mode 100644 index 00000000..84f6777f --- /dev/null +++ b/tests/fuzz/seed/xpath/func_normalize_space @@ -0,0 +1 @@ +normalize-space(.) diff --git a/tests/fuzz/seed/xpath/func_not b/tests/fuzz/seed/xpath/func_not new file mode 100644 index 00000000..44bc806e --- /dev/null +++ b/tests/fuzz/seed/xpath/func_not @@ -0,0 +1 @@ +not(.) diff --git a/tests/fuzz/seed/xpath/func_number_node b/tests/fuzz/seed/xpath/func_number_node new file mode 100644 index 00000000..c1f1c489 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_number_node @@ -0,0 +1 @@ +number(.) diff --git a/tests/fuzz/seed/xpath/func_number_str b/tests/fuzz/seed/xpath/func_number_str new file mode 100644 index 00000000..31a8d993 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_number_str @@ -0,0 +1 @@ +number('1.0') diff --git a/tests/fuzz/seed/xpath/func_position b/tests/fuzz/seed/xpath/func_position new file mode 100644 index 00000000..ec993e8b --- /dev/null +++ b/tests/fuzz/seed/xpath/func_position @@ -0,0 +1 @@ +position() diff --git a/tests/fuzz/seed/xpath/func_round b/tests/fuzz/seed/xpath/func_round new file mode 100644 index 00000000..54315843 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_round @@ -0,0 +1 @@ +round(.) diff --git a/tests/fuzz/seed/xpath/func_starts_with b/tests/fuzz/seed/xpath/func_starts_with new file mode 100644 index 00000000..1a9f1e98 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_starts_with @@ -0,0 +1 @@ +starts-with(.,'t') diff --git a/tests/fuzz/seed/xpath/func_string_length b/tests/fuzz/seed/xpath/func_string_length new file mode 100644 index 00000000..26e107fe --- /dev/null +++ b/tests/fuzz/seed/xpath/func_string_length @@ -0,0 +1 @@ +string-length(.) diff --git a/tests/fuzz/seed/xpath/func_string_node b/tests/fuzz/seed/xpath/func_string_node new file mode 100644 index 00000000..e85c11ca --- /dev/null +++ b/tests/fuzz/seed/xpath/func_string_node @@ -0,0 +1 @@ +string(.) diff --git a/tests/fuzz/seed/xpath/func_string_num b/tests/fuzz/seed/xpath/func_string_num new file mode 100644 index 00000000..6c9fe040 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_string_num @@ -0,0 +1 @@ +string(1.0) diff --git a/tests/fuzz/seed/xpath/func_substring b/tests/fuzz/seed/xpath/func_substring new file mode 100644 index 00000000..f069f81e --- /dev/null +++ b/tests/fuzz/seed/xpath/func_substring @@ -0,0 +1 @@ +substring(.,2,3) diff --git a/tests/fuzz/seed/xpath/func_substring_after b/tests/fuzz/seed/xpath/func_substring_after new file mode 100644 index 00000000..1bbecc93 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_substring_after @@ -0,0 +1 @@ +substring-after(.,'e') diff --git a/tests/fuzz/seed/xpath/func_substring_before b/tests/fuzz/seed/xpath/func_substring_before new file mode 100644 index 00000000..fcb14f14 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_substring_before @@ -0,0 +1 @@ +substring-before(.,'e') diff --git a/tests/fuzz/seed/xpath/func_sum b/tests/fuzz/seed/xpath/func_sum new file mode 100644 index 00000000..d110af82 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_sum @@ -0,0 +1 @@ +sum(*) diff --git a/tests/fuzz/seed/xpath/func_translate b/tests/fuzz/seed/xpath/func_translate new file mode 100644 index 00000000..18fe731a --- /dev/null +++ b/tests/fuzz/seed/xpath/func_translate @@ -0,0 +1 @@ +translate(.,'e','a') diff --git a/tests/fuzz/seed/xpath/func_true b/tests/fuzz/seed/xpath/func_true new file mode 100644 index 00000000..c7fa7136 --- /dev/null +++ b/tests/fuzz/seed/xpath/func_true @@ -0,0 +1 @@ +true() diff --git a/tests/fuzz/seed/xpath/math_abs b/tests/fuzz/seed/xpath/math_abs new file mode 100644 index 00000000..a56bfbf9 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_abs @@ -0,0 +1 @@ +math:abs(-1.5) diff --git a/tests/fuzz/seed/xpath/math_acos b/tests/fuzz/seed/xpath/math_acos new file mode 100644 index 00000000..79d181c8 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_acos @@ -0,0 +1 @@ +math:acos(-0.5) diff --git a/tests/fuzz/seed/xpath/math_asin b/tests/fuzz/seed/xpath/math_asin new file mode 100644 index 00000000..919d6eb4 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_asin @@ -0,0 +1 @@ +math:asin(-0.5) diff --git a/tests/fuzz/seed/xpath/math_atan b/tests/fuzz/seed/xpath/math_atan new file mode 100644 index 00000000..40e6610f --- /dev/null +++ b/tests/fuzz/seed/xpath/math_atan @@ -0,0 +1 @@ +math:atan(-0.5) diff --git a/tests/fuzz/seed/xpath/math_atan2 b/tests/fuzz/seed/xpath/math_atan2 new file mode 100644 index 00000000..c02562ba --- /dev/null +++ b/tests/fuzz/seed/xpath/math_atan2 @@ -0,0 +1 @@ +math:atan2(-1.5,-1.5) diff --git a/tests/fuzz/seed/xpath/math_constant b/tests/fuzz/seed/xpath/math_constant new file mode 100644 index 00000000..bf6fe12b --- /dev/null +++ b/tests/fuzz/seed/xpath/math_constant @@ -0,0 +1 @@ +math:constant('E',20) diff --git a/tests/fuzz/seed/xpath/math_cos b/tests/fuzz/seed/xpath/math_cos new file mode 100644 index 00000000..2a95639c --- /dev/null +++ b/tests/fuzz/seed/xpath/math_cos @@ -0,0 +1 @@ +math:cos(-1.5) diff --git a/tests/fuzz/seed/xpath/math_exp b/tests/fuzz/seed/xpath/math_exp new file mode 100644 index 00000000..5ddf4b6a --- /dev/null +++ b/tests/fuzz/seed/xpath/math_exp @@ -0,0 +1 @@ +math:exp(-1.5) diff --git a/tests/fuzz/seed/xpath/math_highest b/tests/fuzz/seed/xpath/math_highest new file mode 100644 index 00000000..7a64ae57 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_highest @@ -0,0 +1 @@ +math:highest(str:split('1.2,-0.5,-2.2e8,-0.1e-5',',')) diff --git a/tests/fuzz/seed/xpath/math_log b/tests/fuzz/seed/xpath/math_log new file mode 100644 index 00000000..260e6bc5 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_log @@ -0,0 +1 @@ +math:log(2.0) diff --git a/tests/fuzz/seed/xpath/math_lowest b/tests/fuzz/seed/xpath/math_lowest new file mode 100644 index 00000000..5590bee8 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_lowest @@ -0,0 +1 @@ +math:lowest(str:split('1.2,-0.5,-2.2e8,-0.1e-5',',')) diff --git a/tests/fuzz/seed/xpath/math_max b/tests/fuzz/seed/xpath/math_max new file mode 100644 index 00000000..47e745b6 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_max @@ -0,0 +1 @@ +math:max(str:split('1.2,-0.5,-2.2e8,-0.1e-5',',')) diff --git a/tests/fuzz/seed/xpath/math_min b/tests/fuzz/seed/xpath/math_min new file mode 100644 index 00000000..3265d2c2 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_min @@ -0,0 +1 @@ +math:min(str:split('1.2,-0.5,-2.2e8,-0.1e-5',',')) diff --git a/tests/fuzz/seed/xpath/math_power b/tests/fuzz/seed/xpath/math_power new file mode 100644 index 00000000..3c7591c7 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_power @@ -0,0 +1 @@ +math:power(2.0,0.5) diff --git a/tests/fuzz/seed/xpath/math_random b/tests/fuzz/seed/xpath/math_random new file mode 100644 index 00000000..9c6cca42 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_random @@ -0,0 +1 @@ +math:random() diff --git a/tests/fuzz/seed/xpath/math_sin b/tests/fuzz/seed/xpath/math_sin new file mode 100644 index 00000000..ba2e6bb4 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_sin @@ -0,0 +1 @@ +math:sin(-1.5) diff --git a/tests/fuzz/seed/xpath/math_sqrt b/tests/fuzz/seed/xpath/math_sqrt new file mode 100644 index 00000000..36f71c43 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_sqrt @@ -0,0 +1 @@ +math:sqrt(2.0) diff --git a/tests/fuzz/seed/xpath/math_tan b/tests/fuzz/seed/xpath/math_tan new file mode 100644 index 00000000..2329ae52 --- /dev/null +++ b/tests/fuzz/seed/xpath/math_tan @@ -0,0 +1 @@ +math:tan(-1.5) diff --git a/tests/fuzz/seed/xpath/saxon_eval b/tests/fuzz/seed/xpath/saxon_eval new file mode 100644 index 00000000..0f520105 --- /dev/null +++ b/tests/fuzz/seed/xpath/saxon_eval @@ -0,0 +1 @@ +saxon:eval(saxon:expression('1+1')) diff --git a/tests/fuzz/seed/xpath/saxon_evaluate b/tests/fuzz/seed/xpath/saxon_evaluate new file mode 100644 index 00000000..b8102265 --- /dev/null +++ b/tests/fuzz/seed/xpath/saxon_evaluate @@ -0,0 +1 @@ +saxon:evaluate('1+1') diff --git a/tests/fuzz/seed/xpath/saxon_line_number_0 b/tests/fuzz/seed/xpath/saxon_line_number_0 new file mode 100644 index 00000000..5052bc2a --- /dev/null +++ b/tests/fuzz/seed/xpath/saxon_line_number_0 @@ -0,0 +1 @@ +saxon:line-number() diff --git a/tests/fuzz/seed/xpath/saxon_line_number_1 b/tests/fuzz/seed/xpath/saxon_line_number_1 new file mode 100644 index 00000000..542705cf --- /dev/null +++ b/tests/fuzz/seed/xpath/saxon_line_number_1 @@ -0,0 +1 @@ +saxon:line-number(*) diff --git a/tests/fuzz/seed/xpath/saxon_systemId b/tests/fuzz/seed/xpath/saxon_systemId new file mode 100644 index 00000000..2c548b51 --- /dev/null +++ b/tests/fuzz/seed/xpath/saxon_systemId @@ -0,0 +1 @@ +saxon:systemId() diff --git a/tests/fuzz/seed/xpath/set_difference b/tests/fuzz/seed/xpath/set_difference new file mode 100644 index 00000000..2e8678ba --- /dev/null +++ b/tests/fuzz/seed/xpath/set_difference @@ -0,0 +1 @@ +set:difference(//*,//a:*) diff --git a/tests/fuzz/seed/xpath/set_distinct b/tests/fuzz/seed/xpath/set_distinct new file mode 100644 index 00000000..c7dc183b --- /dev/null +++ b/tests/fuzz/seed/xpath/set_distinct @@ -0,0 +1 @@ +set:distinct(//*) diff --git a/tests/fuzz/seed/xpath/set_has_same_node b/tests/fuzz/seed/xpath/set_has_same_node new file mode 100644 index 00000000..83096062 --- /dev/null +++ b/tests/fuzz/seed/xpath/set_has_same_node @@ -0,0 +1 @@ +set:has-same-node(//*,//a:*) diff --git a/tests/fuzz/seed/xpath/set_intersection b/tests/fuzz/seed/xpath/set_intersection new file mode 100644 index 00000000..8f2d97f5 --- /dev/null +++ b/tests/fuzz/seed/xpath/set_intersection @@ -0,0 +1 @@ +set:intersection(//*,//a:*) diff --git a/tests/fuzz/seed/xpath/set_leading b/tests/fuzz/seed/xpath/set_leading new file mode 100644 index 00000000..2b7209ff --- /dev/null +++ b/tests/fuzz/seed/xpath/set_leading @@ -0,0 +1 @@ +set:leading(//*,/*/*[3]) diff --git a/tests/fuzz/seed/xpath/set_trailing b/tests/fuzz/seed/xpath/set_trailing new file mode 100644 index 00000000..fb00d07e --- /dev/null +++ b/tests/fuzz/seed/xpath/set_trailing @@ -0,0 +1 @@ +set:trailing(//*,/*/*[2]) diff --git a/tests/fuzz/seed/xpath/str_align_center b/tests/fuzz/seed/xpath/str_align_center new file mode 100644 index 00000000..4d906bf3 --- /dev/null +++ b/tests/fuzz/seed/xpath/str_align_center @@ -0,0 +1 @@ +str:align('déjà','--------','center') diff --git a/tests/fuzz/seed/xpath/str_align_left b/tests/fuzz/seed/xpath/str_align_left new file mode 100644 index 00000000..66a41084 --- /dev/null +++ b/tests/fuzz/seed/xpath/str_align_left @@ -0,0 +1 @@ +str:align('déjà','--------','left') diff --git a/tests/fuzz/seed/xpath/str_align_right b/tests/fuzz/seed/xpath/str_align_right new file mode 100644 index 00000000..03f20683 --- /dev/null +++ b/tests/fuzz/seed/xpath/str_align_right @@ -0,0 +1 @@ +str:align('déjà','--------','right') diff --git a/tests/fuzz/seed/xpath/str_concat b/tests/fuzz/seed/xpath/str_concat new file mode 100644 index 00000000..9b0bbce5 --- /dev/null +++ b/tests/fuzz/seed/xpath/str_concat @@ -0,0 +1 @@ +str:concat(str:split('ab,cd,ef',',')) diff --git a/tests/fuzz/seed/xpath/str_decode_uri b/tests/fuzz/seed/xpath/str_decode_uri new file mode 100644 index 00000000..f96b345c --- /dev/null +++ b/tests/fuzz/seed/xpath/str_decode_uri @@ -0,0 +1 @@ +str:decode-uri('%41%00%2d') diff --git a/tests/fuzz/seed/xpath/str_encode_uri_1 b/tests/fuzz/seed/xpath/str_encode_uri_1 new file mode 100644 index 00000000..97dbeae1 --- /dev/null +++ b/tests/fuzz/seed/xpath/str_encode_uri_1 @@ -0,0 +1 @@ +str:encode-uri(';/?:@&=+$,[]',true()) diff --git a/tests/fuzz/seed/xpath/str_encode_uri_2 b/tests/fuzz/seed/xpath/str_encode_uri_2 new file mode 100644 index 00000000..09827ae5 --- /dev/null +++ b/tests/fuzz/seed/xpath/str_encode_uri_2 @@ -0,0 +1 @@ +str:encode-uri('|<>',false()) diff --git a/tests/fuzz/seed/xpath/str_padding b/tests/fuzz/seed/xpath/str_padding new file mode 100644 index 00000000..35736cc7 --- /dev/null +++ b/tests/fuzz/seed/xpath/str_padding @@ -0,0 +1 @@ +str:padding(81,' ') diff --git a/tests/fuzz/seed/xpath/str_replace b/tests/fuzz/seed/xpath/str_replace new file mode 100644 index 00000000..56056ae8 --- /dev/null +++ b/tests/fuzz/seed/xpath/str_replace @@ -0,0 +1 @@ +str:replace('abcdefgh',str:split('a,c,e,g',','),str:split('w,x,y,z',',')) diff --git a/tests/fuzz/seed/xpath/str_split b/tests/fuzz/seed/xpath/str_split new file mode 100644 index 00000000..f67c03c9 --- /dev/null +++ b/tests/fuzz/seed/xpath/str_split @@ -0,0 +1 @@ +str:split('a, sim, lis',', ') diff --git a/tests/fuzz/seed/xpath/str_tokenize b/tests/fuzz/seed/xpath/str_tokenize new file mode 100644 index 00000000..fc74e187 --- /dev/null +++ b/tests/fuzz/seed/xpath/str_tokenize @@ -0,0 +1 @@ +str:tokenize('2016-01-01T12:00:00','-T:') diff --git a/tests/fuzz/seed/xpath/xslt_current b/tests/fuzz/seed/xpath/xslt_current new file mode 100644 index 00000000..79021cfc --- /dev/null +++ b/tests/fuzz/seed/xpath/xslt_current @@ -0,0 +1 @@ +current() diff --git a/tests/fuzz/seed/xpath/xslt_document b/tests/fuzz/seed/xpath/xslt_document new file mode 100644 index 00000000..c6027632 --- /dev/null +++ b/tests/fuzz/seed/xpath/xslt_document @@ -0,0 +1 @@ +document('') diff --git a/tests/fuzz/seed/xpath/xslt_element_available b/tests/fuzz/seed/xpath/xslt_element_available new file mode 100644 index 00000000..737c582c --- /dev/null +++ b/tests/fuzz/seed/xpath/xslt_element_available @@ -0,0 +1 @@ +element-available('exsl:document') diff --git a/tests/fuzz/seed/xpath/xslt_format_number b/tests/fuzz/seed/xpath/xslt_format_number new file mode 100644 index 00000000..f85ece94 --- /dev/null +++ b/tests/fuzz/seed/xpath/xslt_format_number @@ -0,0 +1 @@ +format-number(1.0,'##,##,00.00##') diff --git a/tests/fuzz/seed/xpath/xslt_format_number_neg b/tests/fuzz/seed/xpath/xslt_format_number_neg new file mode 100644 index 00000000..360c493f --- /dev/null +++ b/tests/fuzz/seed/xpath/xslt_format_number_neg @@ -0,0 +1 @@ +format-number(1.0,'#.#;-0.0%') diff --git a/tests/fuzz/seed/xpath/xslt_function_available b/tests/fuzz/seed/xpath/xslt_function_available new file mode 100644 index 00000000..814530b7 --- /dev/null +++ b/tests/fuzz/seed/xpath/xslt_function_available @@ -0,0 +1 @@ +function-available('exsl:node-set') diff --git a/tests/fuzz/seed/xpath/xslt_generate_id b/tests/fuzz/seed/xpath/xslt_generate_id new file mode 100644 index 00000000..6221ee56 --- /dev/null +++ b/tests/fuzz/seed/xpath/xslt_generate_id @@ -0,0 +1 @@ +generate-id(.) diff --git a/tests/fuzz/seed/xpath/xslt_system_property b/tests/fuzz/seed/xpath/xslt_system_property new file mode 100644 index 00000000..643acb18 --- /dev/null +++ b/tests/fuzz/seed/xpath/xslt_system_property @@ -0,0 +1 @@ +system-property('xsl:version') diff --git a/tests/fuzz/seed/xpath/xslt_unparsed_entity_uri b/tests/fuzz/seed/xpath/xslt_unparsed_entity_uri new file mode 100644 index 00000000..ba409c0c --- /dev/null +++ b/tests/fuzz/seed/xpath/xslt_unparsed_entity_uri @@ -0,0 +1 @@ +unparsed-entity-uri('a') diff --git a/tests/fuzz/seed/xslt/attr_set b/tests/fuzz/seed/xslt/attr_set new file mode 100644 index 00000000..640c92f7 --- /dev/null +++ b/tests/fuzz/seed/xslt/attr_set @@ -0,0 +1,9 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" xmlns:a="a" xmlns:b="b" version="1.0"> +<x:attribute-set name="s"><x:attribute name="a:f" namespace="a">v</x:attribute></x:attribute-set> +<x:attribute-set name="t" use-attribute-sets="s"><x:attribute name="g">w</x:attribute></x:attribute-set> +<x:template match="a:*"> +<x:element name="e" use-attribute-sets="t"/> +<a:e x:use-attribute-sets="t"/> +<x:copy use-attribute-sets="t"></x:copy> +</x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/cdata b/tests/fuzz/seed/xslt/cdata new file mode 100644 index 00000000..cb03937e --- /dev/null +++ b/tests/fuzz/seed/xslt/cdata @@ -0,0 +1,4 @@ +<x:stylesheet version="1.0" xmlns:x="http://www.w3.org/1999/XSL/Transform" xmlns:a="a" xmlns:b="b"> +<x:output cdata-section-elements="b a:c"/> +<x:template match="*"><x:copy><x:apply-templates select="node()"/></x:copy></x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/decimal_format b/tests/fuzz/seed/xslt/decimal_format new file mode 100644 index 00000000..1a9332e2 --- /dev/null +++ b/tests/fuzz/seed/xslt/decimal_format @@ -0,0 +1,15 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" version="1.0"> +<x:decimal-format name="f" +decimal-separator="•" grouping-separator="`" +infinity="∞" minus-sign="–" NaN="🀀" +percent="⁄" per-mille="*" +zero-digit="0" digit="÷" +pattern-separator="|"/> +<x:template match="*"> +<n><x:value-of select="format-number(123456789.123456,'_÷÷`÷`00•00÷÷_','f')"/></n> +<n><x:value-of select="format-number(-1.5,'÷•÷*|–0•0⁄','f')"/></n> +<n><x:value-of select="format-number(-1 div 0,'0','f')"/></n> +<n><x:value-of select="format-number(0 div 0,'0','f')"/></n> +</x:template> +</x:stylesheet> + diff --git a/tests/fuzz/seed/xslt/element b/tests/fuzz/seed/xslt/element new file mode 100644 index 00000000..7086695e --- /dev/null +++ b/tests/fuzz/seed/xslt/element @@ -0,0 +1,5 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" xmlns:a="a" xmlns:b="b" version="1.0"> +<x:template match="*"><x:element name="e"><x:apply-templates select="node()|@*"/></x:element></x:template> +<x:template match="@*"><x:attribute name="{local-name()}"></x:attribute></x:template> +<x:template match="text()"><x:text></x:text></x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/extension b/tests/fuzz/seed/xslt/extension new file mode 100644 index 00000000..64e850f2 --- /dev/null +++ b/tests/fuzz/seed/xslt/extension @@ -0,0 +1,7 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" xmlns:a="a" xmlns:b="b" xmlns:e1="e1" xmlns:e2="e2" xmlns:e3="e3" version="1.0" extension-element-prefixes="e1 e2 e3"> +<x:template match="*"> +<e3:e><x:fallback><f3/></x:fallback></e3:e> +<x:foo><x:fallback><foo/></x:fallback></x:foo> +<x:apply-templates select="*"/> +</x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/html b/tests/fuzz/seed/xslt/html new file mode 100644 index 00000000..c171a2df --- /dev/null +++ b/tests/fuzz/seed/xslt/html @@ -0,0 +1,4 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:a="a" xmlns:b="b" exclude-result-prefixes="a b"> +<x:output method="html" version="4.0" encoding="iso-8859-1" indent="yes" media-type="t/h"/> +<x:template match="*"><div><img/><x:apply-templates select="node()"/></div></x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/key b/tests/fuzz/seed/xslt/key new file mode 100644 index 00000000..bda12f75 --- /dev/null +++ b/tests/fuzz/seed/xslt/key @@ -0,0 +1,4 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" xmlns:a="a" xmlns:b="b" version="1.0"> +<x:key name="k" match="*" use="."/> +<x:template match="a:*"><x:copy-of select="key('k',.)"/></x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/lre b/tests/fuzz/seed/xslt/lre new file mode 100644 index 00000000..4930ad52 --- /dev/null +++ b/tests/fuzz/seed/xslt/lre @@ -0,0 +1,3 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" xmlns:a="a" xmlns:b="b" version="1.0"> +<x:template match="*"><a:e a="{1+1}"><a:f/></a:e></x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/mode b/tests/fuzz/seed/xslt/mode new file mode 100644 index 00000000..7d587a91 --- /dev/null +++ b/tests/fuzz/seed/xslt/mode @@ -0,0 +1,4 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" xmlns:a="a" xmlns:b="b" version="1.0"> +<x:template match="a:*"><x:apply-templates select="*" mode="m"/></x:template> +<x:template match="*" mode="m"><r/></x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/number b/tests/fuzz/seed/xslt/number new file mode 100644 index 00000000..ed38d63c --- /dev/null +++ b/tests/fuzz/seed/xslt/number @@ -0,0 +1,10 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" version="1.0"> +<x:template match="*"> +<x:number level="any" count="*" from="*" format="1.i.I.A.a"/> +<x:number level="multiple" count="*" format="A.a.I.i.1"/> +<x:number level="single" from="*"/> +<x:number value="123456789" format="1" grouping-separator="’" grouping-size="3"/> +<x:apply-templates select="*"/> +</x:template> +</x:stylesheet> + diff --git a/tests/fuzz/seed/xslt/output b/tests/fuzz/seed/xslt/output new file mode 100644 index 00000000..b1f0176b --- /dev/null +++ b/tests/fuzz/seed/xslt/output @@ -0,0 +1,4 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns="http://www.w3.org/1999/xhtml" xmlns:a="a" xmlns:b="b" exclude-result-prefixes="a b"> +<x:output method="xml" version="1.0" encoding="iso-8859-1" omit-xml-declaration="yes" standalone="yes" doctype-public="p" doctype-system="s" cdata-section-elements="a" indent="yes" media-type="t/x"/> +<x:template match="@*|node()"><x:copy><x:apply-templates select="@*|node()"/></x:copy></x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/param b/tests/fuzz/seed/xslt/param new file mode 100644 index 00000000..f35c92a2 --- /dev/null +++ b/tests/fuzz/seed/xslt/param @@ -0,0 +1,8 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" xmlns:a="a" xmlns:b="b" version="1.0"> +<x:template match="*"> +<x:call-template name="n"><x:with-param name="p" select="."/></x:call-template> +</x:template> +<x:template name="n"> +<x:param name="p"/><x:value-of select="$p"/> +</x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/sort b/tests/fuzz/seed/xslt/sort new file mode 100644 index 00000000..2eebe979 --- /dev/null +++ b/tests/fuzz/seed/xslt/sort @@ -0,0 +1,6 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" xmlns:a="a" xmlns:b="b" version="1.0"> +<x:template match="*"> +<x:for-each select="*"><x:sort select="count(.)" data-type="number" order="ascending"/><x:value-of select="local-name()"/></x:for-each> +<x:copy><x:apply-templates select="*"><x:sort select="." order="descending" lang="en"/></x:apply-templates></x:copy> +</x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/strip_space b/tests/fuzz/seed/xslt/strip_space new file mode 100644 index 00000000..563a327a --- /dev/null +++ b/tests/fuzz/seed/xslt/strip_space @@ -0,0 +1,6 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" xmlns:a="a" xmlns:b="b" version="1.0"> +<x:strip-space elements="a b a:*"/> +<x:preserve-space elements="a:e"/> +<x:output indent="yes"/> +<x:template match="*"><x:copy><x:apply-templates select="node()"/></x:copy></x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/text b/tests/fuzz/seed/xslt/text new file mode 100644 index 00000000..242c2691 --- /dev/null +++ b/tests/fuzz/seed/xslt/text @@ -0,0 +1,4 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" xmlns:a="a" xmlns:b="b" version="1.0"> +<x:output method="text" encoding="iso-8859-1" media-type="t/p"/> +<x:template match="*"><x:copy><x:apply-templates select="node()"/></x:copy></x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/variable b/tests/fuzz/seed/xslt/variable new file mode 100644 index 00000000..5fa2be06 --- /dev/null +++ b/tests/fuzz/seed/xslt/variable @@ -0,0 +1,4 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" xmlns:a="a" xmlns:b="b" version="1.0"> +<x:variable name="g" select="/*"/> +<x:template match="a:*"><x:variable name="v" select="*"/><x:value-of select="$v"/></x:template> +</x:stylesheet> diff --git a/tests/fuzz/seed/xslt/xhtml b/tests/fuzz/seed/xslt/xhtml new file mode 100644 index 00000000..3c521969 --- /dev/null +++ b/tests/fuzz/seed/xslt/xhtml @@ -0,0 +1,4 @@ +<x:stylesheet xmlns:x="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns="http://www.w3.org/1999/xhtml" xmlns:a="a" xmlns:b="b" exclude-result-prefixes="a b"> +<x:output encoding="iso-8859-1" media-type="t/h" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/> +<x:template match="*"><div><img/><x:apply-templates select="node()"/></div></x:template> +</x:stylesheet> diff --git a/tests/fuzz/testTargets.c b/tests/fuzz/testTargets.c new file mode 100644 index 00000000..de17d555 --- /dev/null +++ b/tests/fuzz/testTargets.c @@ -0,0 +1,86 @@ +/* + * testTargets.c: Test the fuzz targets + * + * See Copyright for the status of this software. + */ + +#include <stdio.h> + +#include "fuzz.h" +#include <libxml/globals.h> + +int +testXPath(int argc, char **argv) { + xmlXPathObjectPtr obj; + const char expr[] = "count(//node())"; + int ret = 0; + + if (xsltFuzzXPathInit(&argc, &argv, argv[1]) != 0) { + xsltFuzzXPathCleanup(); + return 1; + } + + obj = xsltFuzzXPath(expr, sizeof(expr) - 1); + if ((obj == NULL) || (obj->type != XPATH_NUMBER)) { + fprintf(stderr, "Expression doesn't evaluate to number\n"); + ret = 1; + } else if (obj->floatval != 39.0) { + fprintf(stderr, "Expression returned %f, expected %f\n", + obj->floatval, 39.0); + ret = 1; + } + + xsltFuzzXPathFreeObject(obj); + xsltFuzzXPathCleanup(); + + return ret; +} + +int +testXslt(int argc, char **argv) { + xmlChar *result; + const char styleBuf[] = + "<xsl:stylesheet" + " xmlns:xsl='http://www.w3.org/1999/XSL/Transform'" + " version='1.0'" + " extension-element-prefixes='" + " exsl exslt crypto date dyn math set str saxon" + "'>\n" + "<xsl:output omit-xml-declaration='yes'/>\n" + "<xsl:template match='/'>\n" + " <r><xsl:value-of select='count(//node())'/></r>\n" + "</xsl:template>\n" + "</xsl:stylesheet>\n"; + int ret = 0; + + if (xsltFuzzXsltInit(&argc, &argv, argv[1]) != 0) { + xsltFuzzXsltCleanup(); + return 1; + } + + result = xsltFuzzXslt(styleBuf, sizeof(styleBuf) - 1); + if (result == NULL) { + fprintf(stderr, "Result is NULL\n"); + ret = 1; + } else if (xmlStrcmp(result, BAD_CAST "<r>42</r>\n") != 0) { + fprintf(stderr, "Stylesheet returned\n%sexpected \n%s\n", + result, "<r>42</r>"); + ret = 1; + } + + xmlFree(result); + xsltFuzzXsltCleanup(); + + return ret; +} + +int main(int argc, char **argv) { + int ret = 0; + + if (testXPath(argc, argv) != 0) + ret = 1; + if (testXslt(argc, argv) != 0) + ret = 1; + + return ret; +} diff --git a/tests/fuzz/xpath.c b/tests/fuzz/xpath.c new file mode 100644 index 00000000..475cb073 --- /dev/null +++ b/tests/fuzz/xpath.c @@ -0,0 +1,20 @@ +/* + * xpath.c: libFuzzer target for XPath expressions + * + * See Copyright for the status of this software. + */ + +#include "fuzz.h" + +int +LLVMFuzzerInitialize(int *argc_p, char ***argv_p) { + return xsltFuzzXPathInit(argc_p, argv_p, NULL); +} + +int +LLVMFuzzerTestOneInput(const char *data, size_t size) { + xmlXPathObjectPtr xpathObj = xsltFuzzXPath(data, size); + xsltFuzzXPathFreeObject(xpathObj); + + return 0; +} diff --git a/tests/fuzz/xpath.dict b/tests/fuzz/xpath.dict new file mode 100644 index 00000000..6699fe8d --- /dev/null +++ b/tests/fuzz/xpath.dict @@ -0,0 +1,70 @@ +# XPath + +axis_ancestor="ancestor::" +axis_ancestor_or_self="ancestor-or-self::" +axis_attribute="attribute::" +axis_attribute_abbrev="@" +axis_child="child::" +axis_descendant="descendant::" +axis_descendant_or_self="descendant-or-self::" +axis_following="following::" +axis_following_sibling="following-sibling::" +axis_namespace="namespace::" +axis_parent="parent::" +axis_preceding="preceding::" +axis_preceding_siblings="preceding-sibling::" +axis_self="self::" + +node_test_ns="a:" + +val_num="=(1.0)" +val_str_sq="=('a')" +val_str_dq="=(\"a\")" +val_node_set="=(*)" +val_elem="=(b)" + +step_root="/" +step_descendant="//" +step_any="//*" +step_any_l="*//" +step_elem="//b" +step_ns_elem="//a:a" +step_comment="//comment()" +step_node="//node()" +step_node_l="node()//" +step_pi="//processing-instruction()" +step_text="//text()" +step_parent="../" + +op_plus="+1" +op_minus=" - 1" +op_neg="-" +op_mul="*1" +op_div=" div 1" +op_mod=" mod 1" +op_and=" and 1" +op_or=" or 1" +op_ne="!=1" +op_lt="<1" +op_gt=">1" +op_le="<=1" +op_ge=">=1" +op_predicate_num="[1]" +op_predicate_last="[last()]" +op_predicate_str="['a']" +op_predicate="[1=1]" +op_arg_num=",1" +op_arg_str=",'a'" +op_arg_node=",*" +op_union="|//b" + +var_num="=$f" +var_bool="=$b" +var_str="=$s" +var_node_set="=$n" + +# Unicode + +utf8_2="\xC3\x84" +utf8_3="\xE2\x80\x9C" +utf8_4="\xF0\x9F\x98\x80" diff --git a/tests/fuzz/xpath.xml b/tests/fuzz/xpath.xml new file mode 100644 index 00000000..0ab51932 --- /dev/null +++ b/tests/fuzz/xpath.xml @@ -0,0 +1,19 @@ +<?pi content?> +<a xmlns:a="a"> + <b xmlns:b="b" a="1" id="b"> + <c b="2">Ärger</c> + <b:d b="3">text</b:d> + <!-- comment --> + <a:b b="4">ß😀</a:b> + <b:c a="4"><![CDATA[text]]></b:c> + </b> + <?pi content?> + <a:e xmlns:c="c" a="αβγ"> + <c:d b="2"/> + <a:c>99</a:c> + <e a="2">content</e> + </a:e> + <b/> + <a:a/> + <!-- comment --> +</a> diff --git a/tests/fuzz/xslt.c b/tests/fuzz/xslt.c new file mode 100644 index 00000000..42ba7881 --- /dev/null +++ b/tests/fuzz/xslt.c @@ -0,0 +1,21 @@ +/* + * xslt.c: libFuzzer target for XSLT stylesheets + * + * See Copyright for the status of this software. + */ + +#include "fuzz.h" +#include <libxml/globals.h> + +int +LLVMFuzzerInitialize(int *argc_p, char ***argv_p) { + return xsltFuzzXsltInit(argc_p, argv_p, NULL); +} + +int +LLVMFuzzerTestOneInput(const char *data, size_t size) { + xmlChar *result = xsltFuzzXslt(data, size); + xmlFree(result); + + return 0; +} diff --git a/tests/fuzz/xslt.dict b/tests/fuzz/xslt.dict new file mode 100644 index 00000000..c7b53618 --- /dev/null +++ b/tests/fuzz/xslt.dict @@ -0,0 +1,83 @@ +# Instructions + +inst_attribute="<x:attribute name=\"n\"></x:attribute>" +inst_apply_imports="<x:apply-imports/>" +inst_apply_templates="<x:apply-templates select=\"*\"/>" +inst_call_template="<x:call-template name=\"n\"/>" +inst_choose="<x:choose><x:when test=\"*\"></x:when><x:otherwise></x:otherwise></x:choose>" +inst_comment="<x:comment>c</x:comment>" +inst_copy="<x:copy></x:copy>" +inst_copy_of="<x:copy-of select=\"*\"/>" +inst_element="<x:element name=\"n\"></x:element>" +inst_for_each="<x:for-each select=\"*\"></x:for-each>" +inst_if="<x:if test=\"*\"></x:if>" +inst_processing_instruction="<x:processing-instruction name=\"pi\">c</x:processing-instruction>" +inst_template_element="<x:template match=\"*\"></x:template>" +inst_template_name="<x:template name=\"n\"></x:template>" +inst_text="<x:text>t</x:text>" +inst_text_noesc="<x:text disable-output-escaping=\"yes\"><>&</x:text>" +inst_var_select="<x:variable name=\"v\" select=\".\"/>" +inst_var_templ="<x:variable name=\"v\"></x:variable>" +inst_value_of="<x:value-of select=\"*\"/>" + +# Move to corpus? +inst_message_no="<x:message terminate=\"no\">m</x:message>" +inst_message_yes="<x:message terminate=\"yes\">m</x:message>" +inst_namespace_alias="<x:namespace-alias stylesheet-prefix=\"a\" result-prefix=\"x\"/>" + +# Attributes + +attr_mode=" mode=\"m\"" +attr_namespace=" namespace=\"a\"" +attr_priority=" priority=\"-0.1\"" + +# XPath + +axis_attribute_abbrev="@" +axis_namespace="namespace::" + +node_test_any="|//*" +node_test_name="|//a" +node_test_qname="|//a:a" +node_test_ns_any="|//a:*" +node_test_comment="|//comment()" +node_test_node="|//node()" +node_test_pi="|//processing-instruction()" +node_test_text="|//text()" +node_test_attr_a="|@a" +node_test_attr_b="|@b" +node_test_parent="|.." + +step="/" +step_a="/a" +step_b="/b" +step_any="/*" +step_node="/node()" +step_text="/text()" +step_comment="/comment()" +step_pi="/processing-instruction()" +step_self="/." +step_parent="/.." +step_namespace="/namespace::*" + +op_and=" and 1" +op_or=" or 0" +op_eq="=*" +op_ne="!=*" +op_gt=">*" +op_plus="+1" +op_mod=" mod 2" + +pred_num="[1]" +pred_string="['a']" +pred_position="[position()]" +pred_last="[last()]" +pred_current="[current()]" + +expr_var="+$v" + +# Unicode + +utf8_2="\xC3\x84" +utf8_3="\xE2\x80\x9C" +utf8_4="\xF0\x9F\x98\x80" diff --git a/tests/fuzz/xslt.xml b/tests/fuzz/xslt.xml new file mode 100644 index 00000000..b20eb192 --- /dev/null +++ b/tests/fuzz/xslt.xml @@ -0,0 +1,21 @@ +<?pi content?> +<a xmlns:a="a"> + <b xmlns:b="b" a="1" id="b"> + <c b="2">Ärger</c> + <b:d b="3">text & <></b:d> + <!-- comment --> + <a:b b="4"> + <a:c>ß😀</a:c> + </a:b> + <b:c a="4"><![CDATA[text]]></b:c> + </b> + <?pi content?> + <a:e xmlns:c="c" a="αβγ"> + <c:d b="2"/> + <a:c>99</a:c> + <e a="2">content</e> + </a:e> + <b/> + <a:a/> + <!-- comment --> +</a> diff --git a/tests/general/Makefile.in b/tests/general/Makefile.in index c7f97f2e..bfb8d743 100644 --- a/tests/general/Makefile.in +++ b/tests/general/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -514,8 +515,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -539,7 +540,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/keys/Makefile.in b/tests/keys/Makefile.in index 52be75f8..69a3abcc 100644 --- a/tests/keys/Makefile.in +++ b/tests/keys/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -317,8 +318,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -342,7 +343,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/multiple/Makefile.in b/tests/multiple/Makefile.in index a8aee803..5228c160 100644 --- a/tests/multiple/Makefile.in +++ b/tests/multiple/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -340,8 +341,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -365,7 +366,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/namespaces/Makefile.in b/tests/namespaces/Makefile.in index e74bd2e6..d528941c 100644 --- a/tests/namespaces/Makefile.in +++ b/tests/namespaces/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -329,8 +330,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -354,7 +355,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/numbers/Makefile.in b/tests/numbers/Makefile.in index ead2bfbf..9da3ad27 100644 --- a/tests/numbers/Makefile.in +++ b/tests/numbers/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -317,8 +318,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -342,7 +343,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am index 0f8c3780..e0736ab9 100644 --- a/tests/plugins/Makefile.am +++ b/tests/plugins/Makefile.am @@ -21,7 +21,7 @@ plugindir = $(abs_builddir)/.libs xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) -xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir) +xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version -rpath $(plugindir) test-logall: @echo '## Running plugin tests' diff --git a/tests/plugins/Makefile.in b/tests/plugins/Makefile.in index fab25580..8eeb2793 100644 --- a/tests/plugins/Makefile.in +++ b/tests/plugins/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -130,7 +130,9 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = \ + ./$(DEPDIR)/xmlsoft_org_xslt_testplugin_la-testplugin.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -207,6 +209,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -286,12 +289,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -301,6 +303,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -365,7 +368,7 @@ CLEANFILES = *.res @WITH_MODULES_TRUE@xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) @WITH_MODULES_TRUE@xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c @WITH_MODULES_TRUE@xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) -@WITH_MODULES_TRUE@xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir) +@WITH_MODULES_TRUE@xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version -rpath $(plugindir) all: all-am .SUFFIXES: @@ -387,8 +390,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -420,7 +423,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlsoft_org_xslt_testplugin_la-testplugin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlsoft_org_xslt_testplugin_la-testplugin.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -508,7 +517,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -579,7 +591,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/xmlsoft_org_xslt_testplugin_la-testplugin.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -625,7 +637,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/xmlsoft_org_xslt_testplugin_la-testplugin.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -646,16 +658,16 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am diff --git a/tests/plugins/testplugin.c b/tests/plugins/testplugin.c index 95bb450d..315d78b2 100644 --- a/tests/plugins/testplugin.c +++ b/tests/plugins/testplugin.c @@ -155,7 +155,7 @@ xsltExtElementPreCompTest(xsltStylesheetPtr style, xmlNodePtr inst, * @ctxt: an XSLT processing context * @node: The current node * @inst: the instruction in the stylesheet - * @comp: precomputed informations + * @comp: precomputed information * * Process a libxslt:test node */ diff --git a/tests/reports/Makefile.in b/tests/reports/Makefile.in index dcd0efc0..23c1a69a 100644 --- a/tests/reports/Makefile.in +++ b/tests/reports/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -324,8 +325,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -349,7 +350,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/xinclude/Makefile.in b/tests/xinclude/Makefile.in index e5a94993..725989fa 100644 --- a/tests/xinclude/Makefile.in +++ b/tests/xinclude/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -324,8 +325,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -349,7 +350,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff --git a/tests/xmlspec/Makefile.in b/tests/xmlspec/Makefile.in index f78ef95b..c6a1dd9e 100644 --- a/tests/xmlspec/Makefile.in +++ b/tests/xmlspec/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -148,6 +148,7 @@ EXEEXT = @EXEEXT@ EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@ EXSLT_LIBDIR = @EXSLT_LIBDIR@ EXSLT_LIBS = @EXSLT_LIBS@ +EXSLT_PRIVATE_LIBS = @EXSLT_PRIVATE_LIBS@ EXTRA_LIBS = @EXTRA_LIBS@ FGREP = @FGREP@ GREP = @GREP@ @@ -227,12 +228,11 @@ STRIP = @STRIP@ THREAD_LIBS = @THREAD_LIBS@ VERSION = @VERSION@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ -WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ WITH_CRYPTO = @WITH_CRYPTO@ WITH_DEBUGGER = @WITH_DEBUGGER@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ WITH_MODULES = @WITH_MODULES@ +WITH_PROFILER = @WITH_PROFILER@ WITH_TRIO = @WITH_TRIO@ WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@ XMLLINT = @XMLLINT@ @@ -242,6 +242,7 @@ XSLTPROCDV = @XSLTPROCDV@ XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@ XSLT_LIBDIR = @XSLT_LIBDIR@ XSLT_LIBS = @XSLT_LIBS@ +XSLT_PRIVATE_LIBS = @XSLT_PRIVATE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -320,8 +321,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -345,7 +346,10 @@ ctags CTAGS: cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ |