added additional check to prevent superfluous namespace href's being

* libxslt/namespaces.c: added additional check to prevent
  superfluous namespace href's being generated on elements
  (bug 136914)
* tests/namespaces/Makefile.am, tests/namespaces/tst5.x[ms]l:
  added new test for bug 136914
* tests/namespaces, tests/extensions/ tests/reports: fixed
  error in "enhanced" Makefile.am, removed superfluous .err files
  from cvs

9 files changed, 11 insertions, 10 deletions

diff --git a/tests/extensions/Makefile.am b/tests/extensions/Makefile.am
index c2b9f542..31cfe67d 100644
--- a/tests/extensions/Makefile.am
+++ b/tests/extensions/Makefile.am
@@ -17,10 +17,10 @@ valgrind:
 test tests: $(top_builddir)/xsltproc/xsltproc
 	@echo '## Running extensions tests'
 	@(echo > .memdump)
-	-@(for i in $(srcdir)/../docs/*.xml ; do \
+	-@(for i in $(srcdir)/*.xml ; do \
 	  if [ -d $$i ] ; then continue ; fi ; \
 	  doc=`basename $$i .xml` ; \
-	  for j in $(srcdir)/$$doc*.xsl ; do \
+	  j=$(srcdir)/$$doc*.xsl ; \
 	  if [ ! -f $$j ] ; then continue ; fi ; \
 	  if [ -d $$j ] ; then continue ; fi ; \
 	  name=`basename $$j .xsl`; \
@@ -47,5 +47,5 @@ test tests: $(top_builddir)/xsltproc/xsltproc
 		echo $$log ; \
 	  fi ; \
 	  rm -f result.$$name err.$$name; \
-	  done ; done)
+	  done)
 
diff --git a/tests/namespaces/Makefile.am b/tests/namespaces/Makefile.am
index ee748dc5..2d76ec6d 100644
--- a/tests/namespaces/Makefile.am
+++ b/tests/namespaces/Makefile.am
@@ -4,11 +4,13 @@ $(top_builddir)/xsltproc/xsltproc:
 	@(cd ../../xsltproc ; $(MAKE) xsltproc)
 
 EXTRA_DIST = \
+    extra.xml extra.xsl extra.out \
+    extra2.xml extra2.xsl extra2.out \
     tst.xml tst.xsl tst.out \
     tst2.xml tst2.xsl tst2.out \
     tst3.xml tst3.xsl tst3.out \
-    extra.out extra.xml extra.xsl \
-    extra2.out extra2.xml extra2.xsl
+    tst4.xml tst4.xsl tst4.out \
+    tst5.xml tst5.xsl tst5.out
 
 all:
 
@@ -19,10 +21,10 @@ valgrind:
 test tests: $(top_builddir)/xsltproc/xsltproc
 	@echo '## Running namespaces tests'
 	@(echo > .memdump)
-	-@(for i in $(srcdir)/../docs/*.xml ; do \
+	-@(for i in $(srcdir)/*.xml ; do \
 	  if [ -d $$i ] ; then continue ; fi ; \
 	  doc=`basename $$i .xml` ; \
-	  for j in $(srcdir)/$$doc*.xsl ; do \
+	  j=$(srcdir)/$$doc.xsl ; \
 	  if [ ! -f $$j ] ; then continue ; fi ; \
 	  if [ -d $$j ] ; then continue ; fi ; \
 	  name=`basename $$j .xsl`; \
@@ -49,5 +51,5 @@ test tests: $(top_builddir)/xsltproc/xsltproc
 		echo $$log ; \
 	  fi ; \
 	  rm -f result.$$name err.$$name; \
-	  done ; done)
+	  done)
 
diff --git a/tests/namespaces/extra.err b/tests/namespaces/extra.err
deleted file mode 100644
index e69de29b..00000000
--- a/tests/namespaces/extra.err
+++ /dev/null
diff --git a/tests/namespaces/tst.err b/tests/namespaces/tst.err
deleted file mode 100644
index e69de29b..00000000
--- a/tests/namespaces/tst.err
+++ /dev/null
diff --git a/tests/namespaces/tst2.err b/tests/namespaces/tst2.err
deleted file mode 100644
index e69de29b..00000000
--- a/tests/namespaces/tst2.err
+++ /dev/null
diff --git a/tests/namespaces/tst3.err b/tests/namespaces/tst3.err
deleted file mode 100644
index e69de29b..00000000
--- a/tests/namespaces/tst3.err
+++ /dev/null
diff --git a/tests/namespaces/tst4.err b/tests/namespaces/tst4.err
deleted file mode 100644
index e69de29b..00000000
--- a/tests/namespaces/tst4.err
+++ /dev/null
diff --git a/tests/reports/Makefile.am b/tests/reports/Makefile.am
index 3c5e5415..14bb655d 100644
--- a/tests/reports/Makefile.am
+++ b/tests/reports/Makefile.am
@@ -4,11 +4,10 @@ $(top_builddir)/xsltproc/xsltproc:
 	@(cd ../../xsltproc ; $(MAKE) xsltproc)
 
 EXTRA_DIST = \
+	cmdlineparams.xml cmdlineparams.xsl cmdlineparams.out \
 	tst-1.xml tst-1.xsl tst-1.out tst-1.err \
 	tst-2.xml tst-2.xsl tst-2.out tst-2.err \
 	undefvar.xml undefvar.xsl undefvar.out undefvar.err \
-	cmdlineparams.xml cmdlineparams.xsl cmdlineparams.out \
-	cmdlineparams.err \
 	recglobparam.xsl recglobvar.xsl reclocparam.xsl reclocvar.xsl \
 	recglobparam.xml recglobvar.xml reclocparam.xml reclocvar.xml 
 
diff --git a/tests/reports/cmdlineparams.err b/tests/reports/cmdlineparams.err
deleted file mode 100644
index e69de29b..00000000
--- a/tests/reports/cmdlineparams.err
+++ /dev/null