continued interrupt commit for enhanced "make tests"

2025-11-02 13:33:20 +03:00 · 2004-03-06 15:11:50 +00:00
parent f11fd0945c
commit efe7443c2b
24 changed files with 993 additions and 443 deletions
--- a/tests/REC2/Makefile.am
+++ b/tests/REC2/Makefile.am
@@ -11,7 +11,9 @@ valgrind:
 	@echo '## Running the regression tests under Valgrind'
 	$(MAKE) CHECKER='valgrind -q' tests

+# Just 3 specific files tested, they either work or don't!
 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running REC2 tests'
 	@(echo > .memdump)
 	@($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/vrml.xsl $(srcdir)/data.xml > vrml.res ; \
 	diff $(srcdir)/vrml.xml vrml.res ; \
--- a/tests/XSLTMark/Makefile.am
+++ b/tests/XSLTMark/Makefile.am
--- a/tests/docbook/Makefile.am
+++ b/tests/docbook/Makefile.am
@@ -2,7 +2,10 @@

 all:

-tests: single xtchunk # Avoid doing the test in normal pass
+tests:
+	@echo -n '## Running docbook tests: '
+	$(MAKE) single
+	$(MAKE) xtchunk

 valgrind:
 	@echo '## Running the regression tests under Valgrind'
@@ -21,64 +24,104 @@ full: tests htmltests xhtmltests fotests
 single:
 	@(echo > .memdump)
 	@(for i in $(srcdir)/test/gdp-handbook.xml ; do \
-	  echo -n "$$i : html " ; \
+	  echo -n "$(basename $$i) : html " ; \
 	  out=$(srcdir)/result/html/`basename $$i .xml`.tst; \
 	  html=$(srcdir)/result/html/`basename $$i .xml`.html; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet $(srcdir)/html/docbook.xsl $$i > $$out ; \
-	  if [ -f $$html ] ; then \
-	      grep -v id < $$html > $$html.noid ; \
-	      grep -v id < $$out > $$out.noid ; \
-	      diff $$html.noid $$out.noid ; \
-	      rm -f $$html.noid $$out.noid ; \
-	  else mv $$out $$html ; fi ; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \
+		$(srcdir)/html/docbook.xsl $$i > $$out ; \
+	    if [ -f $$html ] ; then \
+	  	grep -v id < $$html > $$html.noid ; \
+		grep -v id < $$out > $$out.noid ; \
+		diff $$html.noid $$out.noid ; \
+		rm -f $$html.noid $$out.noid ; \
+	    else \
+		mv $$out $$html ; \
+	    fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true` ; \
+	  if [ -n "$$log" ] ; then \
+		echo ; \
+	  	echo result ; \
+		echo $$log ; \
+	  fi ; \
 	  rm -f $$out ; \
 	  echo -n "fo " ; \
 	  out=$(srcdir)/result/fo/`basename $$i .xml`.tst; \
 	  fo=$(srcdir)/result/fo/`basename $$i .xml`.fo; \
 	  msg=$(srcdir)/result/fo/`basename $$i .xml`.msg; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet $(srcdir)/fo/docbook.xsl $$i > $$out 2> $$msg ; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \
+		$(srcdir)/fo/docbook.xsl $$i > $$out 2> $$msg ; \
 	  if [ -f $$fo ] ; then \
 	      grep -v id < $$fo > $$fo.noid ; \
 	      grep -v id < $$out > $$out.noid ; \
 	      diff $$fo.noid $$out.noid ; \
 	      rm -f $$fo.noid $$out.noid ; \
-	  else mv $$out $$fo ; fi ; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true; \
+	  else \
+		mv $$out $$fo ; \
+	  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=$(srcdir)/result/xhtml/`basename $$i .xml`.tst; \
 	  xhtml=$(srcdir)/result/xhtml/`basename $$i .xml`.xhtml; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet $(srcdir)/xhtml/docbook.xsl $$i > $$out ; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \
+		$(srcdir)/xhtml/docbook.xsl $$i > $$out ; \
 	  if [ -f $$xhtml ] ; then \
 	      grep -v id < $$xhtml > $$xhtml.noid ; \
 	      grep -v id < $$out > $$out.noid ; \
 	      diff $$xhtml.noid $$out.noid ; \
 	      rm -f $$xhtml.noid $$out.noid ; \
-	  else mv $$out $$xhtml ; fi ; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true; \
+	  else \
+		mv $$out $$xhtml ; \
+	  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 ; \
 	  done )

 xtchunk:
 	@(echo > .memdump)
+	@echo -n html-chunking
 	@(for i in $(srcdir)/test/gdp-handbook.xml ; do \
-	  echo "Testing HTML chunking on $$i :" ; \
-	  html=$(srcdir)/result/html/`basename $$i .xml`.html; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc -o $(srcdir)/result/xtchunk/html/gdp-handbook $(srcdir)/html/xtchunk.xsl $$i ; \
-	  for html in $(srcdir)/result/xtchunk/html/*.html ; do \
-	      orig=$(srcdir)/result/xtchunk/html/`basename $$html .html`.orig ;\
+	  base=`basename $$i .xml` ; \
+	  html=$(srcdir)/result/html/$$base.html; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+		-o $(srcdir)/result/xtchunk/html/gdp-handbook \
+		$(srcdir)/html/xtchunk.xsl $$i 2> $$base.err ; \
+	    if [ -f $(srcdir)/result/html/base.err ] ; then \
+		diff $(srcdir)/result/html/base.err $$base.err ; \
+		rm $$base.err ; \
+	    else \
+		mv $$base.err $(srcdir)/result/html/$$base.err ; \
+	    fi ; \
+	    for html in $(srcdir)/result/xtchunk/html/*.html ; do \
+	      orig=$(srcdir)/result/xtchunk/html/\`basename $$html .html\`.orig ;\
 	      if [ -f $$orig ] ; then \
 		  grep -v id < $$html > $$html.noid ; \
 		  grep -v id < $$orig > $$orig.noid ; \
 		  diff $$orig.noid $$html.noid ; \
 		  rm -f $$html.noid $$orig.noid $$html; \
-	      else mv $$html $$orig ; fi ; \
-	  done ; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true; \
+	      else \
+		  mv $$html $$orig ; \
+		fi ; \
+	    done ; \
+	    grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true` ; \
+	  if [ -n "$$log" ] ; then \
+		echo ; \
+	  	echo result ; \
+		echo $$log ; \
+	  fi ; \
 	  rm -f $(srcdir)/result/xtchunk/html/gdp-handbook ; \
 	  done )
+	@echo

 #
 # The full set of tests
--- a/tests/docbook/result/html/gdp-handbook.err
+++ b/tests/docbook/result/html/gdp-handbook.err
@@ -0,0 +1,18 @@
+Writing indexs02.html for sect1
+Writing indexs03.html for sect1
+Writing indexs04.html for sect1
+Writing indexs05.html for sect1
+Writing indexs06.html for sect1
+Writing indexs07.html for sect1
+Writing indexs08.html for sect1
+Writing indexs09.html for sect1
+Writing indexs10.html for sect1
+Writing indexs11.html for sect1
+Writing indexs12.html for sect1
+Writing indexs13.html for sect1
+Writing indexs14.html for sect1
+Writing indexs15.html for sect1
+Writing apas02.html for sect1
+Writing apas03.html for sect1
+Writing apa.html for appendix
+Writing index.html for article
--- a/tests/docs/Makefile.am
+++ b/tests/docs/Makefile.am
@@ -144,6 +144,7 @@ EXTRA_DIST =	\
 	bug-142.xml \
 	bug-143.xml \
 	bug-144.xml \
+	bug-145.xml \
 	character.xml \
 	array.xml \
 	items.xml
--- a/tests/docs/bug-145.xml
+++ b/tests/docs/bug-145.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+
+<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+xmlns:a="a">
+   <xsl:template match="/">
+        <xsl:call-template name="a:a"/>
+   </xsl:template>
+</xsl:transform>
+
+
--- a/tests/exslt/common/Makefile.am
+++ b/tests/exslt/common/Makefile.am
@@ -19,15 +19,34 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running exslt common tests'
 	@(echo > .memdump)
 	@(for i in $(srcdir)/*.xsl ; do \
 	  name=`basename $$i .xsl` ; \
 	  if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \
-	  echo $$name.xml ; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res;\
-	  if [ ! -f $(srcdir)/$$name.out ] ; then cp $$name.res $(srcdir)/$$name.out ; \
-	  else if  [ ! -s $$name.res ] ; then echo "Fatal error, no $$name.res\n" ; \
-	  else diff $(srcdir)/$$name.out $$name.res ; fi ; fi; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
-	  rm -f $$name.res ; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+		$(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\
+	  if [ ! -f $(srcdir)/$$name.out ] ; then \
+		cp $$name.res $(srcdir)/$$name.out ; \
+		if [ -s $$name.bad ] ; then \
+			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 ; \
+		fi ; \
+	  fi; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
+	  if [ -n "$$log" ] ; then \
+	  	echo $$name result ; \
+		echo $$log ; \
+	  fi ; \
+	  rm -f $$name.res $$name.bad; \
 	  done)
--- a/tests/exslt/date/Makefile.am
+++ b/tests/exslt/date/Makefile.am
@@ -48,18 +48,38 @@ test-current:
 	  done)
 	@rm -f current.xml

-test tests: $(top_builddir)/xsltproc/xsltproc test-current
+test-logall:
+	@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` ; \
 	  if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \
-	  echo $$name.xml ; \
-	  $(top_builddir)/xsltproc/xsltproc $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res;\
-	  if [ ! -f $(srcdir)/$$name.out ] ; then cp $$name.res $(srcdir)/$$name.out ; \
-	  else if  [ ! -s $$name.res ] ; then echo "Fatal error, no $$name.res\n" ; \
-	  else diff $(srcdir)/$$name.out $$name.res ; fi ; fi; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
-	  rm -f $$name.res ; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+		$(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\
+	  if [ ! -f $(srcdir)/$$name.out ] ; then \
+		cp $$name.res $(srcdir)/$$name.out ; \
+		if [ -s $$name.bad ] ; then \
+			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 ; \
+		fi ; \
+	  fi; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
+	  if [ -n "$$log" ] ; then \
+	  	echo $$name result ; \
+		echo $$log ; \
+	  fi ; \
+	  rm -f $$name.res $$name.bad; \
 	  done)
-
-
--- a/tests/exslt/functions/Makefile.am
+++ b/tests/exslt/functions/Makefile.am
@@ -20,15 +20,34 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running exslt function tests'
 	@(echo > .memdump)
 	@(for i in $(srcdir)/*.xsl ; do \
 	  name=`basename $$i .xsl` ; \
 	  if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \
-	  echo $$name.xml ; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res;\
-	  if [ ! -f $(srcdir)/$$name.out ] ; then cp $$name.res $(srcdir)/$$name.out ; \
-	  else if  [ ! -s $$name.res ] ; then echo "Fatal error, no $$name.res\n" ; \
-	  else diff $(srcdir)/$$name.out $$name.res ; fi ; fi; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
-	  rm -f $$name.res ; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+		$(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\
+	  if [ ! -f $(srcdir)/$$name.out ] ; then \
+		cp $$name.res $(srcdir)/$$name.out ; \
+		if [ -s $$name.bad ] ; then \
+			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 ; \
+		fi ; \
+	  fi; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
+	  if [ -n "$$log" ] ; then \
+	  	echo $$name result ; \
+		echo $$log ; \
+	  fi ; \
+	  rm -f $$name.res $$name.bad ; \
 	  done)
--- a/tests/exslt/math/Makefile.am
+++ b/tests/exslt/math/Makefile.am
@@ -24,15 +24,34 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running exslt math tests'
 	@(echo > .memdump)
 	@(for i in $(srcdir)/*.xsl ; do \
 	  name=`basename $$i .xsl` ; \
 	  if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \
-	  echo $$name.xml ; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res;\
-	  if [ ! -f $(srcdir)/$$name.out ] ; then cp $$name.res $(srcdir)/$$name.out ; \
-	  else if  [ ! -s $$name.res ] ; then echo "Fatal error, no $$name.res\n" ; \
-	  else diff $(srcdir)/$$name.out $$name.res ; fi ; fi; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
-	  rm -f $$name.res ; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+		$(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\
+	  if [ ! -f $(srcdir)/$$name.out ] ; then \
+		cp $$name.res $(srcdir)/$$name.out ; \
+		if [ -s $$name.bad ] ; then \
+			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 ; \
+		fi ; \
+	  fi; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
+	  if [ -n "$$log" ] ; then \
+	  	echo $$name result ; \
+		echo $$log ; \
+	  fi ; \
+	  rm -f $$name.res $$name.bad ; \
 	  done)
--- a/tests/exslt/sets/Makefile.am
+++ b/tests/exslt/sets/Makefile.am
@@ -17,15 +17,34 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running exslt sets tests'
 	@(echo > .memdump)
 	@(for i in $(srcdir)/*.xsl ; do \
 	  name=`basename $$i .xsl` ; \
 	  if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \
-	  echo $$name.xml ; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res;\
-	  if [ ! -f $(srcdir)/$$name.out ] ; then cp $$name.res $(srcdir)/$$name.out ; \
-	  else if  [ ! -s $$name.res ] ; then echo "Fatal error, no $$name.res\n" ; \
-	  else diff $(srcdir)/$$name.out $$name.res ; fi ; fi; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
-	  rm -f $$name.res ; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+		$(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\
+	  if [ ! -f $(srcdir)/$$name.out ] ; then \
+		cp $$name.res $(srcdir)/$$name.out ; \
+		if [ -s $$name.bad ] ; then \
+			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 ; \
+		fi ; \
+	  fi; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
+	  if [ -n "$$log" ] ; then \
+	  	echo $$name result ; \
+		echo $$log ; \
+	  fi ; \
+	  rm -f $$name.res $$name.bad ; \
 	  done)
--- a/tests/exslt/strings/Makefile.am
+++ b/tests/exslt/strings/Makefile.am
@@ -16,15 +16,34 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running exslt string tests'
 	@(echo > .memdump)
 	@(for i in $(srcdir)/*.xsl ; do \
 	  name=`basename $$i .xsl` ; \
 	  if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \
-	  echo $$name.xml ; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res;\
-	  if [ ! -f $(srcdir)/$$name.out ] ; then cp $$name.res $(srcdir)/$$name.out ; \
-	  else if  [ ! -s $$name.res ] ; then echo "Fatal error, no $$name.res\n" ; \
-	  else diff $(srcdir)/$$name.out $$name.res ; fi ; fi; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
-	  rm -f $$name.res ; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+		$(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\
+	  if [ ! -f $(srcdir)/$$name.out ] ; then \
+		cp $$name.res $(srcdir)/$$name.out ; \
+		if [ -s $$name.bad ] ; then \
+			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 ; \
+		fi ; \
+	  fi; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
+	  if [ -n "$$log" ] ; then \
+	  	echo $$name result ; \
+		echo $$log ; \
+	  fi ; \
+	  rm -f $$name.res $$name.bad ; \
 	  done)
--- a/tests/extensions/Makefile.am
+++ b/tests/extensions/Makefile.am
@@ -15,8 +15,9 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running extensions tests'
 	@(echo > .memdump)
-	@(for i in $(srcdir)/*.xml ; do \
+	-@(for i in $(srcdir)/../docs/*.xml ; do \
 	  if [ -d $$i ] ; then continue ; fi ; \
 	  doc=`basename $$i .xml` ; \
 	  for j in $(srcdir)/$$doc*.xsl ; do \
@@ -24,11 +25,27 @@ test tests: $(top_builddir)/xsltproc/xsltproc
 	  if [ -d $$j ] ; then continue ; fi ; \
 	  name=`basename $$j .xsl`; \
 	  out=$(srcdir)/"$$name".out; \
-	  echo Running $$j on $$i ; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i > result.$$name;\
-	  if [ ! -f $$out ] ; then cp result.$$name $$out ; \
-	  else diff $$out result.$$name; fi ; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
-	  rm -f result.$$name ; \
+	  err=$(srcdir)/"$$name".err; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i \
+	  	> result.$$name 2>err.$$name; \
+	  if [ ! -f $$out ] ; then \
+	  	cp result.$$name $$out ; \
+		if [ -s err.$$name ] ; then \
+			cp err.$$name $$err ; \
+		fi ; \
+	  else \
+	  	diff $$out result.$$name; \
+		if [ -s $$err ] ; then \
+	  		diff $$err err.$$name; \
+		else \
+			diff /dev/null err.$$name; \
+		fi ; \
+	  fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
+	  if [ -n "$$log" ] ; then \
+	  	echo $$name result ; \
+		echo $$log ; \
+	  fi ; \
+	  rm -f result.$$name err.$$name; \
 	  done ; done)

--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -63,7 +63,7 @@ EXTRA_DIST = \
    bug-56.out bug-56.xsl \
    bug-57.out bug-57.xsl \
    bug-59.out bug-59.xsl \
-    bug-60.out bug-60.xsl \
+    bug-60.out bug-60.xsl bug-60.err \
    bug-61.out bug-61.xsl \
    bug-62-inc.out bug-62-inc.xsl \
    bug-62.out bug-62.xsl \
@@ -150,6 +150,7 @@ EXTRA_DIST = \
    bug-142.out bug-142.xsl \
    bug-143.out bug-143.xsl \
    bug-144.out bug-144.xsl \
+    bug-145.out bug-145.xsl bug-145.err \
    character.out character.xsl \
    character2.out character2.xsl \
    itemschoose.out itemschoose.xsl \
@@ -163,8 +164,9 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running general tests'
 	@(echo > .memdump)
-	@(for i in $(srcdir)/../docs/*.xml ; do \
+	-@(for i in $(srcdir)/../docs/*.xml ; do \
 	  if [ -d $$i ] ; then continue ; fi ; \
 	  doc=`basename $$i .xml` ; \
 	  for j in $(srcdir)/$$doc*.xsl ; do \
@@ -172,11 +174,27 @@ test tests: $(top_builddir)/xsltproc/xsltproc
 	  if [ -d $$j ] ; then continue ; fi ; \
 	  name=`basename $$j .xsl`; \
 	  out=$(srcdir)/"$$name".out; \
-	  echo Running $$j on $$i ; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i > result.$$name;\
-	  if [ ! -f $$out ] ; then cp result.$$name $$out ; \
-	  else diff $$out result.$$name; fi ; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
-	  rm -f result.$$name ; \
+	  err=$(srcdir)/"$$name".err; \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i \
+	  	> result.$$name 2>err.$$name; \
+	  if [ ! -f $$out ] ; then \
+	  	cp result.$$name $$out ; \
+		if [ -s err.$$name ] ; then \
+			cp err.$$name $$err ; \
+		fi ; \
+	  else \
+	  	diff $$out result.$$name; \
+		if [ -s $$err ] ; then \
+	  		diff $$err err.$$name; \
+		else \
+			diff /dev/null err.$$name; \
+		fi ; \
+	  fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
+	  if [ -n "$$log" ] ; then \
+	  	echo $$name result ; \
+		echo $$log ; \
+	  fi ; \
+	  rm -f result.$$name err.$$name; \
 	  done ; done)

--- a/tests/general/bug-145.err
+++ b/tests/general/bug-145.err
@@ -0,0 +1,5 @@
+compilation error: file ./bug-145.xsl line 4 element transform
+xsl:version is missing: document may not be a stylesheet
+runtime error: file ./bug-145.xsl line 6 element call-template
+xsl:call-template : template :a not found
+no result for ./../docs/bug-145.xml
--- a/tests/general/bug-145.out
+++ b/tests/general/bug-145.out
--- a/tests/general/bug-145.xsl
+++ b/tests/general/bug-145.xsl
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+
+<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+xmlns:a="a">
+   <xsl:template match="/">
+        <xsl:call-template name="a:a"/>
+   </xsl:template>
+</xsl:transform>
+
+
--- a/tests/general/bug-60.err
+++ b/tests/general/bug-60.err
@@ -0,0 +1,2 @@
+compilation error: file ./bug-60.xsl line 6 element foo-of
+xsltStylePreCompute: unknown xsl:foo-of
--- a/tests/keys/Makefile.am
+++ b/tests/keys/Makefile.am
@@ -12,6 +12,7 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running keys tests'
 	@(echo > .memdump)
 	@($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/month.xsl $(srcdir)/dates.xml > month.res ; \
 	if [ -r $(srcdir)/month.out ] ; \
--- a/tests/multiple/Makefile.am
+++ b/tests/multiple/Makefile.am
@@ -35,6 +35,7 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running multiple tests'
 	@(echo > .memdump)
 	@($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/dict.xsl $(srcdir)/dict.xml > dict.res ; \
 	diff $(srcdir)/result.xml dict.res; \
--- a/tests/namespaces/Makefile.am
+++ b/tests/namespaces/Makefile.am
@@ -17,22 +17,37 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running namespaces tests'
 	@(echo > .memdump)
-	@(for i in $(srcdir)/*.xml ; do \
-	  doc="`basename $$i .xml`" ; \
-	  j=$(srcdir)/"$$doc".xsl; \
+	-@(for i in $(srcdir)/../docs/*.xml ; do \
+	  if [ -d $$i ] ; then continue ; fi ; \
+	  doc=`basename $$i .xml` ; \
+	  for j in $(srcdir)/$$doc*.xsl ; do \
 	  if [ ! -f $$j ] ; then continue ; fi ; \
 	  if [ -d $$j ] ; then continue ; fi ; \
-	  name="`basename $$j .xsl`"; \
+	  name=`basename $$j .xsl`; \
 	  out=$(srcdir)/"$$name".out; \
 	  err=$(srcdir)/"$$name".err; \
-	  echo $$j ; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i > result.$$name 2>err.$$name;\
-	  if [ ! -f $$out ] ; then cp result.$$name $$out ; \
-	  else diff $$out result.$$name ; fi ; \
-	  if [ ! -f $$err ] ; then cp err.$$name $$err ; \
-	  else diff $$err err.$$name ; fi ; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
-	  rm -f result.$$name ; \
-	  done)
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i \
+	  	> result.$$name 2>err.$$name; \
+	  if [ ! -f $$out ] ; then \
+	  	cp result.$$name $$out ; \
+		if [ -s err.$$name ] ; then \
+			cp err.$$name $$err ; \
+		fi ; \
+	  else \
+	  	diff $$out result.$$name; \
+		if [ -s $$err ] ; then \
+	  		diff $$err err.$$name; \
+		else \
+			diff /dev/null err.$$name; \
+		fi ; \
+	  fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
+	  if [ -n "$$log" ] ; then \
+	  	echo $$name result ; \
+		echo $$log ; \
+	  fi ; \
+	  rm -f result.$$name err.$$name; \
+	  done ; done)

--- a/tests/numbers/Makefile.am
+++ b/tests/numbers/Makefile.am
@@ -12,6 +12,7 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running numbers tests'
 	@(echo > .memdump)
 	@($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/format-number.xsl $(srcdir)/format-number.xml > format-number.res ; \
 	diff $(srcdir)/format-number.out format-number.res ; \
--- a/tests/reports/Makefile.am
+++ b/tests/reports/Makefile.am
@@ -20,26 +20,40 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running reports tests'
 	@(echo > .memdump)
-	@(for i in $(srcdir)/*.xml ; do \
+	-@(for i in $(srcdir)/../docs/*.xml ; do \
 	  if [ -d $$i ] ; then continue ; fi ; \
 	  doc=`basename $$i .xml` ; \
-	  for j in $(srcdir)/$$doc.xsl ; do \
+	  for j in $(srcdir)/$$doc*.xsl ; do \
 	  if [ ! -f $$j ] ; then continue ; fi ; \
 	  if [ -d $$j ] ; then continue ; fi ; \
 	  name=`basename $$j .xsl`; \
 	  out=$(srcdir)/"$$name".out; \
 	  err=$(srcdir)/"$$name".err; \
-	  echo Running $$j on $$i ; \
-	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
 	              --stringparam test passed_value \
 		      --stringparam test2 passed_value2 \
 	              $$j $$i > result.$$name \
 	              2> err.$$name ; \
-	  if [ ! -f $$out ] ; \
-	  then cp result.$$name $$out; cp err.$$name $$err ; \
-	  else diff $$out result.$$name; diff $$err err.$$name; fi ; \
-	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
-	  rm -f result.$$name err.$$name ; \
+	  if [ ! -f $$out ] ; then \
+	  	cp result.$$name $$out ; \
+		if [ -s err.$$name ] ; then \
+			cp err.$$name $$err ; \
+		fi ; \
+	  else \
+	  	diff $$out result.$$name; \
+		if [ -s $$err ] ; then \
+	  		diff $$err err.$$name; \
+		else \
+			diff /dev/null err.$$name; \
+		fi ; \
+	  fi ; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
+	  if [ -n "$$log" ] ; then \
+	  	echo $$name result ; \
+		echo $$log ; \
+	  fi ; \
+	  rm -f result.$$name err.$$name; \
 	  done ; done)

--- a/tests/xmlspec/Makefile.am
+++ b/tests/xmlspec/Makefile.am
@@ -14,17 +14,33 @@ valgrind:
 	$(MAKE) CHECKER='valgrind -q' tests

 test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running xmlspec tests'
 	@(echo > .memdump)
-	@($(CHECKER) $(top_builddir)/xsltproc/xsltproc -timing $(srcdir)/REC-xml-2e.xsl $(srcdir)/REC-xml-20001006.xml > REC-xml-20001006.out 2> debug ; \
-	diff $(srcdir)/REC-xml-20001006.html REC-xml-20001006.out | grep -v 'id[0-9]' | grep -v -- '---' | grep -v 100 | grep -v 3866 ; \
-	grep implemented debug | sort | uniq -c || true; \
-	grep " ms$$" debug || true; \
-	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
-	rm -f REC-xml-20001006.out)
-	@($(CHECKER) $(top_builddir)/xsltproc/xsltproc  -timing --param show.diff.markup 1 $(srcdir)/REC-xml-2e.xsl $(srcdir)/REC-xml-20001006.xml > REC-xml-20001006-review.out 2> debug ; \
-	diff $(srcdir)/REC-xml-20001006-review.html REC-xml-20001006-review.out | grep -v 'id[0-9]' | grep -v -- '---' | grep -v 117 | grep -v 4066 ; \
-	grep implemented debug | sort | uniq -c || true; \
-	grep " ms$$" debug || true; \
-	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
-	rm -f REC-xml-20001006-review.out)
+	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc -timing \
+		$(srcdir)/REC-xml-2e.xsl $(srcdir)/REC-xml-20001006.xml \
+		> REC-xml-20001006.out 2> debug ; \
+	  diff $(srcdir)/REC-xml-20001006.html REC-xml-20001006.out | \
+		grep -v 'id[0-9]' | grep -v -- '---' | grep -v 100 | grep -v 3866 ; \
+	  grep implemented debug | sort | uniq -c || true; \
+	  grep " ms$$" debug || true; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`
+	@if [ -n "$$log" ] ; then \
+	  	echo REC-xml-20001006 result ; \
+		echo $$log ; \
+	fi
+	@rm -f REC-xml-20001006.out
+	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc  \
+		-timing --param show.diff.markup 1 \
+		$(srcdir)/REC-xml-2e.xsl $(srcdir)/REC-xml-20001006.xml \
+		> REC-xml-20001006-review.out 2> debug ; \
+	  diff $(srcdir)/REC-xml-20001006-review.html REC-xml-20001006-review.out | \
+		grep -v 'id[0-9]' | grep -v -- '---' | grep -v 117 | grep -v 4066 ; \
+	  grep implemented debug | sort | uniq -c || true; \
+	  grep " ms$$" debug || true; \
+	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`
+	@if [ -n "$$log" ] ; then \
+	  	echo "REC-xml-20001006 (show.diff.markup) result" ; \
+		echo $$log ; \
+	fi
+	@rm -f REC-xml-20001006-review.out