summaryrefslogtreecommitdiff
path: root/tests/exslt/saxon
diff options
context:
space:
mode:
Diffstat (limited to 'tests/exslt/saxon')
-rw-r--r--tests/exslt/saxon/Makefile.am14
-rw-r--r--tests/exslt/saxon/Makefile.in17
-rw-r--r--tests/exslt/saxon/eval.2.err2
-rw-r--r--tests/exslt/saxon/eval.2.out2
-rw-r--r--tests/exslt/saxon/eval.3.err3
-rw-r--r--tests/exslt/saxon/eval.3.out2
6 files changed, 15 insertions, 25 deletions
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/>