diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-10-17 14:50:30 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-10-17 14:50:42 +0900 |
| commit | 2fc5ced0b429ea2b81ded947cfcb85d98112ad87 (patch) | |
| tree | b3a8e0ec8a3f8ac57adf89b7edf453ddaca8fb7a /tests | |
| parent | effb43a066e70763fa89eb7142b7cb7b428694ad (diff) | |
| download | libxslt-2fc5ced0b429ea2b81ded947cfcb85d98112ad87.tar.gz libxslt-2fc5ced0b429ea2b81ded947cfcb85d98112ad87.tar.bz2 libxslt-2fc5ced0b429ea2b81ded947cfcb85d98112ad87.zip | |
Imported Upstream version 1.1.30_rc1upstream/1.1.30_rc1
Change-Id: Ie087e3508369ac612459f31961addc691f2302c1
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'tests')
64 files changed, 225 insertions, 131 deletions
diff --git a/tests/Makefile.in b/tests/Makefile.in index 64b7c729..33f7caa5 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -269,6 +269,9 @@ 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@ diff --git a/tests/REC/Makefile.in b/tests/REC/Makefile.in index fb63d8a8..1532e3ed 100644 --- a/tests/REC/Makefile.in +++ b/tests/REC/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/REC/test-2.5-1.err b/tests/REC/test-2.5-1.err index 7fbacdd7..141a1016 100644 --- a/tests/REC/test-2.5-1.err +++ b/tests/REC/test-2.5-1.err @@ -1,4 +1,2 @@ -compilation error: file ./test-2.5-1.xsl line 6 element exciting-new-1.8-feature -xsltStylePreCompute: unknown xsl:exciting-new-1.8-feature compilation error: file ./test-2.5-1.xsl line 2 element stylesheet -xsl:version: only 1.0 features are supported +xsl:version: only 1.1 features are supported diff --git a/tests/REC1/Makefile.in b/tests/REC1/Makefile.in index 0524e5f6..ebd3982a 100644 --- a/tests/REC1/Makefile.in +++ b/tests/REC1/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/REC2/Makefile.in b/tests/REC2/Makefile.in index e0c049de..f092a13b 100644 --- a/tests/REC2/Makefile.in +++ b/tests/REC2/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/XSLTMark/Makefile.in b/tests/XSLTMark/Makefile.in index 944c0477..cd04b34f 100644 --- a/tests/XSLTMark/Makefile.in +++ b/tests/XSLTMark/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/docbook/Makefile.am b/tests/docbook/Makefile.am index 09e7239b..25f09ce9 100644 --- a/tests/docbook/Makefile.am +++ b/tests/docbook/Makefile.am @@ -1,9 +1,8 @@ ## Process this file with automake to produce Makefile.in tests: - @echo '## Running docbook tests' - $(MAKE) single - $(MAKE) xtchunk + @$(MAKE) single + @$(MAKE) xtchunk valgrind: @echo '## Running the regression tests under Valgrind' @@ -22,12 +21,12 @@ full: tests htmltests xhtmltests fotests # a single tests to check that stuff ain't broken # single: + @echo '## Running single docbook tests' @$(MKDIR_P) result/html @$(MKDIR_P) result/fo @$(MKDIR_P) result/xhtml @(echo > .memdump) @(for i in $(srcdir)/test/gdp-handbook.xml ; do \ - echo -n "`basename $$i` : html " ; \ out=result/html/`basename $$i .xml`.tst; \ html=result/html/`basename $$i .xml`.html; \ log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \ @@ -42,12 +41,10 @@ single: fi ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true` ; \ if [ -n "$$log" ] ; then \ - echo ; \ echo result ; \ echo "$$log" ; \ fi ; \ rm -f $$out ; \ - echo -n "fo " ; \ out=result/fo/`basename $$i .xml`.tst; \ fo=result/fo/`basename $$i .xml`.fo; \ msg=result/fo/`basename $$i .xml`.msg; \ @@ -63,12 +60,10 @@ single: fi ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true` ; \ if [ -n "$$log" ] ; then \ - echo ; \ echo result ; \ echo "$$log" ; \ fi ; \ rm -f $$out $$msg ; \ - echo -n "xhtml " ; \ out=result/xhtml/`basename $$i .xml`.tst; \ xhtml=result/xhtml/`basename $$i .xml`.xhtml; \ log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \ @@ -83,19 +78,17 @@ single: fi ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true` ; \ if [ -n "$$log" ] ; then \ - echo ; \ echo result ; \ echo "$$log" ; \ fi ; \ rm -f $$out ; \ done ) - @echo xtchunk: + @echo '## Running xtchunk docbook tests' @$(MKDIR_P) result/html @$(MKDIR_P) result/xtchunk @(echo > .memdump) - @echo -n html-chunking @(for i in $(srcdir)/test/gdp-handbook.xml ; do \ base=`basename $$i .xml` ; \ html=result/html/$$base.html; \ @@ -121,13 +114,11 @@ xtchunk: done ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true` ; \ if [ -n "$$log" ] ; then \ - echo ; \ echo result ; \ echo "$$log" ; \ fi ; \ rm -f result/xtchunk/html/gdp-handbook ; \ done ) - @echo # # The full set of tests diff --git a/tests/docbook/Makefile.in b/tests/docbook/Makefile.in index 7047918d..4ac3c3db 100644 --- a/tests/docbook/Makefile.in +++ b/tests/docbook/Makefile.in @@ -209,6 +209,9 @@ 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@ @@ -496,9 +499,8 @@ uninstall-am: tests: - @echo '## Running docbook tests' - $(MAKE) single - $(MAKE) xtchunk + @$(MAKE) single + @$(MAKE) xtchunk valgrind: @echo '## Running the regression tests under Valgrind' @@ -513,12 +515,12 @@ full: tests htmltests xhtmltests fotests # a single tests to check that stuff ain't broken # single: + @echo '## Running single docbook tests' @$(MKDIR_P) result/html @$(MKDIR_P) result/fo @$(MKDIR_P) result/xhtml @(echo > .memdump) @(for i in $(srcdir)/test/gdp-handbook.xml ; do \ - echo -n "`basename $$i` : html " ; \ out=result/html/`basename $$i .xml`.tst; \ html=result/html/`basename $$i .xml`.html; \ log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \ @@ -533,12 +535,10 @@ single: fi ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true` ; \ if [ -n "$$log" ] ; then \ - echo ; \ echo result ; \ echo "$$log" ; \ fi ; \ rm -f $$out ; \ - echo -n "fo " ; \ out=result/fo/`basename $$i .xml`.tst; \ fo=result/fo/`basename $$i .xml`.fo; \ msg=result/fo/`basename $$i .xml`.msg; \ @@ -554,12 +554,10 @@ single: fi ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true` ; \ if [ -n "$$log" ] ; then \ - echo ; \ echo result ; \ echo "$$log" ; \ fi ; \ rm -f $$out $$msg ; \ - echo -n "xhtml " ; \ out=result/xhtml/`basename $$i .xml`.tst; \ xhtml=result/xhtml/`basename $$i .xml`.xhtml; \ log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \ @@ -574,19 +572,17 @@ single: fi ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true` ; \ if [ -n "$$log" ] ; then \ - echo ; \ echo result ; \ echo "$$log" ; \ fi ; \ rm -f $$out ; \ done ) - @echo xtchunk: + @echo '## Running xtchunk docbook tests' @$(MKDIR_P) result/html @$(MKDIR_P) result/xtchunk @(echo > .memdump) - @echo -n html-chunking @(for i in $(srcdir)/test/gdp-handbook.xml ; do \ base=`basename $$i .xml` ; \ html=result/html/$$base.html; \ @@ -612,13 +608,11 @@ xtchunk: done ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true` ; \ if [ -n "$$log" ] ; then \ - echo ; \ echo result ; \ echo "$$log" ; \ fi ; \ rm -f result/xtchunk/html/gdp-handbook ; \ done ) - @echo # # The full set of tests diff --git a/tests/docs/Makefile.in b/tests/docs/Makefile.in index 03e47325..a1e6cc50 100644 --- a/tests/docs/Makefile.in +++ b/tests/docs/Makefile.in @@ -213,6 +213,9 @@ 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@ diff --git a/tests/documents/Makefile.in b/tests/documents/Makefile.in index 3708011f..62b54677 100644 --- a/tests/documents/Makefile.in +++ b/tests/documents/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/documents/message.result b/tests/documents/message.result index 0dbde5b5..965a84b4 100644 --- a/tests/documents/message.result +++ b/tests/documents/message.result @@ -1,2 +1,3 @@ A simple message A fatal message +no result for ./message.xml diff --git a/tests/exslt/Makefile.in b/tests/exslt/Makefile.in index 7869a0d7..a8a56ac6 100644 --- a/tests/exslt/Makefile.in +++ b/tests/exslt/Makefile.in @@ -269,6 +269,9 @@ 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@ diff --git a/tests/exslt/common/Makefile.in b/tests/exslt/common/Makefile.in index 014612ee..f866ff17 100644 --- a/tests/exslt/common/Makefile.in +++ b/tests/exslt/common/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/exslt/crypto/Makefile.in b/tests/exslt/crypto/Makefile.in index 84d3dc36..46608356 100644 --- a/tests/exslt/crypto/Makefile.in +++ b/tests/exslt/crypto/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/exslt/date/Makefile.am b/tests/exslt/date/Makefile.am index ec1b896b..515f5496 100644 --- a/tests/exslt/date/Makefile.am +++ b/tests/exslt/date/Makefile.am @@ -38,23 +38,22 @@ CLEANFILES = .memdump test-current: @(echo > .memdump) - @echo \<doc/\> >current.xml - @echo "#" - @echo "# Inspect the following for correctness" - @echo "#" - @(for i in $(srcdir)/current.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ - $(top_builddir)/xsltproc/xsltproc $(srcdir)/$$name.xsl $(srcdir)/$$name.xml;\ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - done) - @rm -f current.xml + @(if [ -z "$$CONTINUOUS_INTEGRATION" ]; then \ + echo \<doc/\> >current.xml ; \ + echo "#" ; \ + echo "# Inspect the following for correctness" ; \ + echo "#" ; \ + for i in $(srcdir)/current.xsl ; do \ + name=`basename $$i .xsl` ; \ + if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ + $(top_builddir)/xsltproc/xsltproc $(srcdir)/$$name.xsl $(srcdir)/$$name.xml;\ + grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ + done ; \ + rm -f current.xml ; \ + fi) -test-logall: +test tests: $(top_builddir)/xsltproc/xsltproc test-current @echo '## Running exslt date tests' - -test tests: $(top_builddir)/xsltproc/xsltproc test-logall test-current - @echo '## Running exslt common tests' @(echo > .memdump) @(for i in $(srcdir)/*.xsl ; do \ name=`basename $$i .xsl` ; \ diff --git a/tests/exslt/date/Makefile.in b/tests/exslt/date/Makefile.in index e901ea5b..46439b85 100644 --- a/tests/exslt/date/Makefile.in +++ b/tests/exslt/date/Makefile.in @@ -209,6 +209,9 @@ 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@ @@ -527,23 +530,22 @@ $(top_builddir)/xsltproc/xsltproc: test-current: @(echo > .memdump) - @echo \<doc/\> >current.xml - @echo "#" - @echo "# Inspect the following for correctness" - @echo "#" - @(for i in $(srcdir)/current.xsl ; do \ - name=`basename $$i .xsl` ; \ - if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ - $(top_builddir)/xsltproc/xsltproc $(srcdir)/$$name.xsl $(srcdir)/$$name.xml;\ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - done) - @rm -f current.xml - -test-logall: + @(if [ -z "$$CONTINUOUS_INTEGRATION" ]; then \ + echo \<doc/\> >current.xml ; \ + echo "#" ; \ + echo "# Inspect the following for correctness" ; \ + echo "#" ; \ + for i in $(srcdir)/current.xsl ; do \ + name=`basename $$i .xsl` ; \ + if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \ + $(top_builddir)/xsltproc/xsltproc $(srcdir)/$$name.xsl $(srcdir)/$$name.xml;\ + grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ + done ; \ + rm -f current.xml ; \ + fi) + +test tests: $(top_builddir)/xsltproc/xsltproc test-current @echo '## Running exslt date tests' - -test tests: $(top_builddir)/xsltproc/xsltproc test-logall test-current - @echo '## Running exslt common tests' @(echo > .memdump) @(for i in $(srcdir)/*.xsl ; do \ name=`basename $$i .xsl` ; \ diff --git a/tests/exslt/date/add.1.out b/tests/exslt/date/add.1.out index 47394ae2..76c18651 100644 --- a/tests/exslt/date/add.1.out +++ b/tests/exslt/date/add.1.out @@ -21,6 +21,8 @@ add : -0001 + -PT59S result : -0002-12-31T23:59:01Z add : -0001 + P1Y result : 0001 +add : -0001-01-01 + P2Y +result : 0002-01-01 add : 2000-01 + -PT86400S result : 1999-12-31 add : 2000-01 + -P1D diff --git a/tests/exslt/date/add.1.xml b/tests/exslt/date/add.1.xml index 5555747e..94cf1ad5 100644 --- a/tests/exslt/date/add.1.xml +++ b/tests/exslt/date/add.1.xml @@ -11,6 +11,7 @@ <date date='2000-01-01T00:00:00Z' dur='-PT59S'/> <date date='-0001' dur='-PT59S'/> <date date='-0001' dur='P1Y'/> + <date date='-0001-01-01' dur='P2Y'/> <date date='2000-01' dur='-PT86400S'/> <date date='2000-01' dur='-P1D'/> <date date='1970-01-01T00:00:00-00:30' dur='-PT30S'/> diff --git a/tests/exslt/date/date.1.out b/tests/exslt/date/date.1.out index f22546c5..8296de53 100644 --- a/tests/exslt/date/date.1.out +++ b/tests/exslt/date/date.1.out @@ -73,8 +73,8 @@ minute-in-hour : NaN second-in-minute : NaN - Test Date : -0004-02-29 - year : -4 + Test Date : -0005-02-29 + year : -5 leap-year : true month-in-year : 2 month-name : February @@ -83,9 +83,9 @@ day-in-year : 60 day-in-month : 29 day-of-week-in-month : 5 - day-in-week : 1 - day-name : Sunday - day-abbreviation : Sun + day-in-week : 5 + day-name : Thursday + day-abbreviation : Thu time : hour-in-day : NaN minute-in-hour : NaN diff --git a/tests/exslt/date/date.1.xml b/tests/exslt/date/date.1.xml index 562e08e8..7f3e9f50 100644 --- a/tests/exslt/date/date.1.xml +++ b/tests/exslt/date/date.1.xml @@ -5,7 +5,7 @@ <date date="3000-01-31"/> <date date="2000-02-29"/> <date date="9990001-12-31Z"/> - <date date="-0004-02-29"/> + <date date="-0005-02-29"/> <date date="1999-01-02"/> <date date="1999-01-03"/> <date date="2004-01-01"/> diff --git a/tests/exslt/date/datetime.1.out b/tests/exslt/date/datetime.1.out index c0b4c537..273130d5 100644 --- a/tests/exslt/date/datetime.1.out +++ b/tests/exslt/date/datetime.1.out @@ -39,12 +39,12 @@ Test Date : -0001-12-31T23:59:59-05:00 year : -1 - leap-year : false + leap-year : true month-in-year : 12 month-name : December month-abbreviation : Dec week-in-year : 52 - day-in-year : 365 + day-in-year : 366 day-in-month : 31 day-of-week-in-month : 5 day-in-week : 1 @@ -75,17 +75,17 @@ Test Date : -10000-12-31T23:59:59Z year : -10000 - leap-year : true + leap-year : false month-in-year : 12 month-name : December month-abbreviation : Dec week-in-year : 1 - day-in-year : 366 + day-in-year : 365 day-in-month : 31 day-of-week-in-month : 5 - day-in-week : 4 - day-name : Wednesday - day-abbreviation : Wed + day-in-week : 2 + day-name : Monday + day-abbreviation : Mon time : 23:59:59Z hour-in-day : 23 minute-in-hour : 59 diff --git a/tests/exslt/date/difference.1.out b/tests/exslt/date/difference.1.out index bcafa2ba..0329e150 100644 --- a/tests/exslt/date/difference.1.out +++ b/tests/exslt/date/difference.1.out @@ -14,7 +14,9 @@ result : -P366D difference : 0002-05-05 - 0001-01 result : -P1Y4M difference : -0002-01-05 - 0001-01-04 -result : P729D +result : P730D +difference : 0002 - -0001 +result : -P2Y difference : 1970-01-01T05:04:03 - 1970-01-01T04:03:02 result : -PT1H1M1S difference : 2000-01-01T05:00:03 - 2000-01-01T04:03:02 @@ -34,4 +36,8 @@ result : -PT2S difference : 2000-01-02T05:00:03 - 2000-01-01T04:03:02 result : -P1DT57M1S difference : 2016-04-28T17:59:30+02:00 - 2016-04-28T17:59:30+04:00 -result : -PT2H
\ No newline at end of file +result : -PT2H +difference : 2000-01-05T01:00:00+11:00 - 2000-01-01T23:00:00-11:00 +result : -P2DT4H +difference : 2000-01-01T23:00:00-11:00 - 2000-01-05T01:00:00+11:00 +result : P2DT4H
\ No newline at end of file diff --git a/tests/exslt/date/difference.1.xml b/tests/exslt/date/difference.1.xml index ca897c09..cfc4759d 100644 --- a/tests/exslt/date/difference.1.xml +++ b/tests/exslt/date/difference.1.xml @@ -9,6 +9,7 @@ <date date1='0002-01-05' date2='0001-01-04'/> <date date1='0002-05-05' date2='0001-01'/> <date date1='-0002-01-05' date2='0001-01-04'/> + <date date1='0002' date2='-0001'/> <date date1='1970-01-01T05:04:03' date2='1970-01-01T04:03:02'/> <date date1='2000-01-01T05:00:03' date2='2000-01-01T04:03:02'/> <date date1='2000-01-01T05:00:03' date2='1980-01-01T04:03:02'/> @@ -23,5 +24,7 @@ <date date1='2000-01-02T05:00:03' date2='2000-01-01T04:03:02'/> <!-- with timezone --> <date date1='2016-04-28T17:59:30+02:00' date2='2016-04-28T17:59:30+04:00'/> + <date date1='2000-01-05T01:00:00+11:00' date2='2000-01-01T23:00:00-11:00'/> + <date date1='2000-01-01T23:00:00-11:00' date2='2000-01-05T01:00:00+11:00'/> </page> diff --git a/tests/exslt/date/gyear.1.out b/tests/exslt/date/gyear.1.out index 9a7b2918..c5c517cd 100644 --- a/tests/exslt/date/gyear.1.out +++ b/tests/exslt/date/gyear.1.out @@ -73,8 +73,8 @@ minute-in-hour : NaN second-in-minute : NaN - Test Date : -0004 - year : -4 + Test Date : -0005 + year : -5 leap-year : true month-in-year : NaN month-name : diff --git a/tests/exslt/date/gyear.1.xml b/tests/exslt/date/gyear.1.xml index 95d776b0..fb1e5771 100644 --- a/tests/exslt/date/gyear.1.xml +++ b/tests/exslt/date/gyear.1.xml @@ -5,6 +5,6 @@ <date date="3000"/>
<date date="2000"/>
<date date="9990001"/>
- <date date="-0004"/>
+ <date date="-0005"/>
</page>
diff --git a/tests/exslt/date/gyearmonth.1.out b/tests/exslt/date/gyearmonth.1.out index 57580c76..6ffef038 100644 --- a/tests/exslt/date/gyearmonth.1.out +++ b/tests/exslt/date/gyearmonth.1.out @@ -73,8 +73,8 @@ minute-in-hour : NaN second-in-minute : NaN - Test Date : -0004-02 - year : -4 + Test Date : -0005-02 + year : -5 leap-year : true month-in-year : 2 month-name : February diff --git a/tests/exslt/date/gyearmonth.1.xml b/tests/exslt/date/gyearmonth.1.xml index 08a7d29b..3e3bdaf4 100644 --- a/tests/exslt/date/gyearmonth.1.xml +++ b/tests/exslt/date/gyearmonth.1.xml @@ -5,6 +5,6 @@ <date date="3000-01"/>
<date date="2000-02"/>
<date date="9990001-12"/>
- <date date="-0004-02"/>
+ <date date="-0005-02"/>
</page>
diff --git a/tests/exslt/date/seconds.1.out b/tests/exslt/date/seconds.1.out index c0eb72c0..9044a312 100644 --- a/tests/exslt/date/seconds.1.out +++ b/tests/exslt/date/seconds.1.out @@ -17,6 +17,10 @@ seconds : -P0Y0M31DT10H10M10.09S result : -2715010.09 seconds : PT100H100M100.001S result : 366100.001 +seconds : PT10H10M.5S +result : 36600.5 +seconds : PT10H10M5.S +result : 36605 seconds : 2001 result : 978307200 seconds : 2001-10-29T10:31:07 @@ -34,7 +38,7 @@ result : 31536000 seconds : 0001-01-01T00:00:00 result : -6.21355968e+10 seconds : -0001-01-01T00:00:00 -result : -6.21671328e+10 +result : -6.21672192e+10 seconds : 1970-01-01 result : 0 seconds : 1970-01-01Z diff --git a/tests/exslt/date/seconds.1.xml b/tests/exslt/date/seconds.1.xml index 24d58fb2..6e33f5c8 100644 --- a/tests/exslt/date/seconds.1.xml +++ b/tests/exslt/date/seconds.1.xml @@ -10,6 +10,8 @@ <date duration="P0Y0M31DT10H10M10.09S"/> <date duration="-P0Y0M31DT10H10M10.09S"/> <date duration="PT100H100M100.001S"/> + <date duration="PT10H10M.5S"/> + <date duration="PT10H10M5.S"/> <!-- date/times --> <date duration="2001"/> <date duration="2001-10-29T10:31:07"/> diff --git a/tests/exslt/date/seconds.2.out b/tests/exslt/date/seconds.2.out index e804d94c..944b7141 100644 --- a/tests/exslt/date/seconds.2.out +++ b/tests/exslt/date/seconds.2.out @@ -7,8 +7,6 @@ seconds : PT-10D result : NaN seconds : --PT10H result : NaN -seconds : PT10H10M.5S -result : NaN seconds : PYT0.00001S result : NaN seconds : PT49.00001 diff --git a/tests/exslt/date/seconds.2.xml b/tests/exslt/date/seconds.2.xml index 276baef7..9052b8f2 100644 --- a/tests/exslt/date/seconds.2.xml +++ b/tests/exslt/date/seconds.2.xml @@ -5,7 +5,6 @@ <date duration="P-T10D"/> <date duration="PT-10D"/> <date duration="--PT10H"/> - <date duration="PT10H10M.5S"/> <date duration="PYT0.00001S"/> <date duration="PT49.00001"/> <date duration="P0Y0MDT10H10M10.09S"/> diff --git a/tests/exslt/dynamic/Makefile.in b/tests/exslt/dynamic/Makefile.in index 3d625ebc..4a1a88ce 100644 --- a/tests/exslt/dynamic/Makefile.in +++ b/tests/exslt/dynamic/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/exslt/functions/Makefile.am b/tests/exslt/functions/Makefile.am index 303043a1..3241284e 100644 --- a/tests/exslt/functions/Makefile.am +++ b/tests/exslt/functions/Makefile.am @@ -13,7 +13,8 @@ EXTRA_DIST = \ function.7.out function.7.xml function.7.xsl \ function.8.out function.8.xml function.8.xsl \ function.9.out function.9.xml function.9.xsl \ - function.10.out function.10.xml function.10.xsl + function.10.out function.10.xml function.10.xsl \ + function.11.out function.11.xml function.11.xsl CLEANFILES = .memdump diff --git a/tests/exslt/functions/Makefile.in b/tests/exslt/functions/Makefile.in index 9087164b..a4091562 100644 --- a/tests/exslt/functions/Makefile.in +++ b/tests/exslt/functions/Makefile.in @@ -209,6 +209,9 @@ 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@ @@ -307,7 +310,8 @@ EXTRA_DIST = \ function.7.out function.7.xml function.7.xsl \ function.8.out function.8.xml function.8.xsl \ function.9.out function.9.xml function.9.xsl \ - function.10.out function.10.xml function.10.xsl + function.10.out function.10.xml function.10.xsl \ + function.11.out function.11.xml function.11.xsl CLEANFILES = .memdump all: all-am diff --git a/tests/exslt/functions/function.11.out b/tests/exslt/functions/function.11.out new file mode 100644 index 00000000..6dde03e7 --- /dev/null +++ b/tests/exslt/functions/function.11.out @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<a><b/></a> diff --git a/tests/exslt/functions/function.11.xml b/tests/exslt/functions/function.11.xml new file mode 100644 index 00000000..8e39ecbe --- /dev/null +++ b/tests/exslt/functions/function.11.xml @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<doc/> diff --git a/tests/exslt/functions/function.11.xsl b/tests/exslt/functions/function.11.xsl new file mode 100644 index 00000000..7a3437a6 --- /dev/null +++ b/tests/exslt/functions/function.11.xsl @@ -0,0 +1,32 @@ +<?xml version="1.0"?> + +<xsl:stylesheet + version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:func="http://exslt.org/functions" + xmlns:test="test" + extension-element-prefixes="func" +> + <func:function name="test:fragment"> + <func:result> + <a> + <b/> + </a> + </func:result> + </func:function> + + <func:function name="test:func1"> + <xsl:variable name="var" select="test:fragment()"/> + <func:result select="$var"/> + </func:function> + + <func:function name="test:func2"> + <xsl:variable name="var" select="test:func1()"/> + <func:result select="$var"/> + </func:function> + + <xsl:template match="/"> + <xsl:copy-of select="test:func2()"/> + </xsl:template> +</xsl:stylesheet> + diff --git a/tests/exslt/math/Makefile.in b/tests/exslt/math/Makefile.in index 1f7d7b7d..4012f2a1 100644 --- a/tests/exslt/math/Makefile.in +++ b/tests/exslt/math/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/exslt/saxon/Makefile.am b/tests/exslt/saxon/Makefile.am index 9e7b3160..3ef3a2ca 100644 --- a/tests/exslt/saxon/Makefile.am +++ b/tests/exslt/saxon/Makefile.am @@ -29,15 +29,11 @@ test tests: $(top_builddir)/xsltproc/xsltproc mv $$name.bad $(srcdir)/$$name.err ; \ fi ; \ else \ - if [ ! -s $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ + diff $(srcdir)/$$name.out $$name.res ; \ + if [ -s $(srcdir)/$$name.err ] ; then \ + diff $(srcdir)/$$name.err $$name.bad; \ + else \ + diff /dev/null $$name.bad; \ fi ; \ fi; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ diff --git a/tests/exslt/saxon/Makefile.in b/tests/exslt/saxon/Makefile.in index b200df3a..bb6b58e7 100644 --- a/tests/exslt/saxon/Makefile.in +++ b/tests/exslt/saxon/Makefile.in @@ -209,6 +209,9 @@ 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@ @@ -518,15 +521,11 @@ test tests: $(top_builddir)/xsltproc/xsltproc mv $$name.bad $(srcdir)/$$name.err ; \ fi ; \ else \ - if [ ! -s $$name.res ] ; then \ - echo "Fatal error, no $$name.res\n" ; \ - else \ - diff $(srcdir)/$$name.out $$name.res ; \ - if [ -s $(srcdir)/$$name.err ] ; then \ - diff $(srcdir)/$$name.err $$name.bad; \ - else \ - diff /dev/null $$name.bad; \ - fi ; \ + diff $(srcdir)/$$name.out $$name.res ; \ + if [ -s $(srcdir)/$$name.err ] ; then \ + diff $(srcdir)/$$name.err $$name.bad; \ + else \ + diff /dev/null $$name.bad; \ fi ; \ fi; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\ diff --git a/tests/exslt/saxon/eval.2.err b/tests/exslt/saxon/eval.2.err index df8adfbc..7fdd4320 100644 --- a/tests/exslt/saxon/eval.2.err +++ b/tests/exslt/saxon/eval.2.err @@ -2,6 +2,6 @@ XPath error : Invalid expression ### ^ XPath error : Invalid expression -xmlXPathCompiledEval: evaluation failed runtime error: file ./eval.2.xsl line 11 element value-of XPath evaluation returned no result. +no result for ./eval.2.xml diff --git a/tests/exslt/saxon/eval.2.out b/tests/exslt/saxon/eval.2.out index 3048a905..e69de29b 100644 --- a/tests/exslt/saxon/eval.2.out +++ b/tests/exslt/saxon/eval.2.out @@ -1,2 +0,0 @@ -<?xml version="1.0"?> -<results/> diff --git a/tests/exslt/saxon/eval.3.err b/tests/exslt/saxon/eval.3.err index 5a87793b..573d4f68 100644 --- a/tests/exslt/saxon/eval.3.err +++ b/tests/exslt/saxon/eval.3.err @@ -1,6 +1,5 @@ XPath error : Undefined namespace prefix -xmlXPathCompiledEval: evaluation failed XPath error : Invalid expression -xmlXPathCompiledEval: evaluation failed runtime error: file ./eval.3.xsl line 11 element value-of XPath evaluation returned no result. +no result for ./eval.3.xml diff --git a/tests/exslt/saxon/eval.3.out b/tests/exslt/saxon/eval.3.out index 3048a905..e69de29b 100644 --- a/tests/exslt/saxon/eval.3.out +++ b/tests/exslt/saxon/eval.3.out @@ -1,2 +0,0 @@ -<?xml version="1.0"?> -<results/> diff --git a/tests/exslt/sets/Makefile.in b/tests/exslt/sets/Makefile.in index 75b52279..7d3f9313 100644 --- a/tests/exslt/sets/Makefile.in +++ b/tests/exslt/sets/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/exslt/strings/Makefile.in b/tests/exslt/strings/Makefile.in index 2cd3bbde..647b0b67 100644 --- a/tests/exslt/strings/Makefile.in +++ b/tests/exslt/strings/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/extensions/Makefile.in b/tests/extensions/Makefile.in index 49e753a6..36182bb7 100644 --- a/tests/extensions/Makefile.in +++ b/tests/extensions/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/general/Makefile.in b/tests/general/Makefile.in index 84d2fa81..f25b55b2 100644 --- a/tests/general/Makefile.in +++ b/tests/general/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/general/bug-165.err b/tests/general/bug-165.err index d7564e2c..490fe538 100644 --- a/tests/general/bug-165.err +++ b/tests/general/bug-165.err @@ -2,3 +2,4 @@ runtime error: file ./bug-165.xsl line 6 element value-of Variable 'pStyle' has not been declared. runtime error: file ./bug-165.xsl line 6 element value-of XPath evaluation returned no result. +no result for ./../docs/bug-165.xml diff --git a/tests/general/bug-165.out b/tests/general/bug-165.out index 0d7d44b4..e69de29b 100644 --- a/tests/general/bug-165.out +++ b/tests/general/bug-165.out @@ -1,8 +0,0 @@ -<?xml version="1.0"?> - - - - - - - diff --git a/tests/general/bug-175.err b/tests/general/bug-175.err index 70cddd5b..61f2edc7 100644 --- a/tests/general/bug-175.err +++ b/tests/general/bug-175.err @@ -1,6 +1,2 @@ -compilation error: file ./bug-175.xsl line 28 element function -xsltStylePreCompute: unknown xsl:function compilation error: file ./bug-175.xsl line 5 element transform -xsl:version: only 1.0 features are supported -compilation error: file ./bug-175.xsl line 28 element function -xsltParseStylesheetTop: ignoring unknown function element +xsl:version: only 1.1 features are supported diff --git a/tests/general/bug-175.xsl b/tests/general/bug-175.xsl index f25e4c94..8ab9f989 100644 --- a/tests/general/bug-175.xsl +++ b/tests/general/bug-175.xsl @@ -25,6 +25,9 @@ </html> </xsl:template> - <xsl:function name="test:test">YES</xsl:function> + <xsl:function name="test:test"> + <xsl:param name="x"/> + <xsl:text>YES</xsl:text> + </xsl:function> </xsl:transform> diff --git a/tests/general/bug-180.err b/tests/general/bug-180.err index e0e568ec..6dd9bb20 100644 --- a/tests/general/bug-180.err +++ b/tests/general/bug-180.err @@ -1,2 +1,3 @@ runtime error: file ./bug-180.xsl line 4 element copy-of Variable 'xxx' has not been declared. +no result for ./../docs/bug-180.xml diff --git a/tests/general/bug-184.err b/tests/general/bug-184.err index ec5e9124..9f029c9c 100644 --- a/tests/general/bug-184.err +++ b/tests/general/bug-184.err @@ -1,5 +1,5 @@ runtime error: file ./bug-184.xsl line 5 element value-of Variable 'nonexistent' has not been declared. -xmlXPathCompiledEval: 1 objects left on the stack. runtime error: file ./bug-184.xsl line 5 element value-of XPath evaluation returned no result. +no result for ./../docs/bug-184.xml diff --git a/tests/general/bug-184.out b/tests/general/bug-184.out index e829790a..e69de29b 100644 --- a/tests/general/bug-184.out +++ b/tests/general/bug-184.out @@ -1,2 +0,0 @@ -<?xml version="1.0"?> -<result/> diff --git a/tests/keys/Makefile.in b/tests/keys/Makefile.in index cdd50f61..5babc761 100644 --- a/tests/keys/Makefile.in +++ b/tests/keys/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/multiple/Makefile.in b/tests/multiple/Makefile.in index 1ad5e437..9e907ef0 100644 --- a/tests/multiple/Makefile.in +++ b/tests/multiple/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/namespaces/Makefile.in b/tests/namespaces/Makefile.in index 6351b095..59bbc649 100644 --- a/tests/namespaces/Makefile.in +++ b/tests/namespaces/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/numbers/Makefile.in b/tests/numbers/Makefile.in index 74e93313..99999ab9 100644 --- a/tests/numbers/Makefile.in +++ b/tests/numbers/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am index e0736ab9..0f8c3780 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 = -module -avoid-version -rpath $(plugindir) +xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_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 c51070e2..4984f2ed 100644 --- a/tests/plugins/Makefile.in +++ b/tests/plugins/Makefile.in @@ -268,6 +268,9 @@ 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@ @@ -367,7 +370,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 = -module -avoid-version -rpath $(plugindir) +@WITH_MODULES_TRUE@xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir) all: all-am .SUFFIXES: diff --git a/tests/reports/Makefile.in b/tests/reports/Makefile.in index 1813704f..c2de722d 100644 --- a/tests/reports/Makefile.in +++ b/tests/reports/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/xinclude/Makefile.in b/tests/xinclude/Makefile.in index 7043d72b..dd21095f 100644 --- a/tests/xinclude/Makefile.in +++ b/tests/xinclude/Makefile.in @@ -209,6 +209,9 @@ 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@ diff --git a/tests/xmlspec/Makefile.in b/tests/xmlspec/Makefile.in index 30963db9..8c45cd2f 100644 --- a/tests/xmlspec/Makefile.in +++ b/tests/xmlspec/Makefile.in @@ -209,6 +209,9 @@ 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@ |