Merge commit '49e8fbec2420ef55b3246aabd89328b13530810c' as 'libxslt'

35 files changed, 369 insertions, 0 deletions

diff --git a/libxslt/tests/namespaces/Makefile.am b/libxslt/tests/namespaces/Makefile.am
new file mode 100644
index 0000000..a81f22f
--- /dev/null
+++ b/libxslt/tests/namespaces/Makefile.am
@@ -0,0 +1,59 @@
+## Process this file with automake to produce Makefile.in
+
+$(top_builddir)/xsltproc/xsltproc:
+	@(cd ../../xsltproc ; $(MAKE) xsltproc)
+
+EXTRA_DIST = \
+    extra.xml extra.xsl extra.out \
+    extra2.xml extra2.xsl extra2.out extra2.err\
+    tst.xml tst.xsl tst.out \
+    tst2.xml tst2.xsl tst2.out \
+    tst3.xml tst3.xsl tst3.out \
+    tst4.xml tst4.xsl tst4.out \
+    tst5.xml tst5.xsl tst5.out \
+    tst6.xml tst6.xsl tst6.out \
+    tst7.xml tst7.xsl tst7.out \
+    tst8.xml tst8.xsl tst8.out \
+    tst9.xml tst9.xsl tst9.out
+
+CLEANFILES = .memdump
+
+valgrind:
+	@echo '## Running the regression tests under Valgrind'
+	$(MAKE) CHECKER='libtool --mode=execute valgrind -q --leak-check=full' tests
+
+test tests: $(top_builddir)/xsltproc/xsltproc
+	@echo '## Running namespaces tests'
+	@(echo > .memdump)
+	-@(for i in $(srcdir)/*.xml ; do \
+	  if [ -d $$i ] ; then continue ; fi ; \
+	  doc=`basename $$i .xml` ; \
+	  j=$(srcdir)/$$doc.xsl ; \
+	  if [ ! -f $$j ] ; then continue ; fi ; \
+	  if [ -d $$j ] ; then continue ; fi ; \
+	  name=`basename $$j .xsl`; \
+	  out=$(srcdir)/"$$name".out; \
+	  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)
+
diff --git a/libxslt/tests/namespaces/extra.out b/libxslt/tests/namespaces/extra.out
new file mode 100644
index 0000000..e8333e8
--- /dev/null
+++ b/libxslt/tests/namespaces/extra.out
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<libxml:debug xmlns:libxml="http://xmlsoft.org/XSLT/namespace"/>
diff --git a/libxslt/tests/namespaces/extra.xml b/libxslt/tests/namespaces/extra.xml
new file mode 100644
index 0000000..69d62f2
--- /dev/null
+++ b/libxslt/tests/namespaces/extra.xml
@@ -0,0 +1 @@
+<doc/>
diff --git a/libxslt/tests/namespaces/extra.xsl b/libxslt/tests/namespaces/extra.xsl
new file mode 100644
index 0000000..fec3a0f
--- /dev/null
+++ b/libxslt/tests/namespaces/extra.xsl
@@ -0,0 +1,8 @@
+<xsl:stylesheet version="1.0"
+	      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	      xmlns:libxml="http://xmlsoft.org/XSLT/namespace">
+
+<xsl:template match="/">
+<libxml:debug/>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/libxslt/tests/namespaces/extra2.err b/libxslt/tests/namespaces/extra2.err
new file mode 100644
index 0000000..a1c21e5
--- /dev/null
+++ b/libxslt/tests/namespaces/extra2.err
@@ -0,0 +1,3 @@
+Templates:
+#0 name / 
+Variables:
diff --git a/libxslt/tests/namespaces/extra2.out b/libxslt/tests/namespaces/extra2.out
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/libxslt/tests/namespaces/extra2.out
diff --git a/libxslt/tests/namespaces/extra2.xml b/libxslt/tests/namespaces/extra2.xml
new file mode 100644
index 0000000..69d62f2
--- /dev/null
+++ b/libxslt/tests/namespaces/extra2.xml
@@ -0,0 +1 @@
+<doc/>
diff --git a/libxslt/tests/namespaces/extra2.xsl b/libxslt/tests/namespaces/extra2.xsl
new file mode 100644
index 0000000..52b63c8
--- /dev/null
+++ b/libxslt/tests/namespaces/extra2.xsl
@@ -0,0 +1,10 @@
+<xsl:stylesheet version="1.0"
+	      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	      xmlns="http://www.w3.org/TR/xhtml1/strict"
+	      xmlns:libxml="http://xmlsoft.org/XSLT/namespace"
+	      extension-element-prefixes="libxml">
+
+<xsl:template match="/">
+<libxml:debug/>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/libxslt/tests/namespaces/tst.out b/libxslt/tests/namespaces/tst.out
new file mode 100644
index 0000000..3db52e1
--- /dev/null
+++ b/libxslt/tests/namespaces/tst.out
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+     
+     
+     
+     
+     
+success
+
+     
+     
+     
+
diff --git a/libxslt/tests/namespaces/tst.xml b/libxslt/tests/namespaces/tst.xml
new file mode 100644
index 0000000..300001b
--- /dev/null
+++ b/libxslt/tests/namespaces/tst.xml
@@ -0,0 +1,10 @@
+<tst>
+     <doc/>
+     <doc/>
+     <doc/>
+     <doc/>
+     <doc>Failed</doc>
+     <doc/>
+     <doc/>
+     <doc/>
+</tst>
diff --git a/libxslt/tests/namespaces/tst.xsl b/libxslt/tests/namespaces/tst.xsl
new file mode 100644
index 0000000..3aa676e
--- /dev/null
+++ b/libxslt/tests/namespaces/tst.xsl
@@ -0,0 +1,8 @@
+<xsl:stylesheet version="1.0"
+	      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	      xmlns="http://www.w3.org/TR/xhtml1/strict">
+
+<xsl:template match="doc[5]">
+success
+</xsl:template>
+</xsl:stylesheet>
diff --git a/libxslt/tests/namespaces/tst2.out b/libxslt/tests/namespaces/tst2.out
new file mode 100644
index 0000000..3db52e1
--- /dev/null
+++ b/libxslt/tests/namespaces/tst2.out
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+     
+     
+     
+     
+     
+success
+
+     
+     
+     
+
diff --git a/libxslt/tests/namespaces/tst2.xml b/libxslt/tests/namespaces/tst2.xml
new file mode 100644
index 0000000..2e0375d
--- /dev/null
+++ b/libxslt/tests/namespaces/tst2.xml
@@ -0,0 +1,10 @@
+<tst xmlns="http://example.org/">
+     <doc/>
+     <doc/>
+     <doc/>
+     <doc/>
+     <doc>Failed</doc>
+     <doc/>
+     <doc/>
+     <doc/>
+</tst>
diff --git a/libxslt/tests/namespaces/tst2.xsl b/libxslt/tests/namespaces/tst2.xsl
new file mode 100644
index 0000000..a41435b
--- /dev/null
+++ b/libxslt/tests/namespaces/tst2.xsl
@@ -0,0 +1,9 @@
+<xsl:stylesheet version="1.0"
+	      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	      xmlns="http://www.w3.org/TR/xhtml1/strict"
+	      xmlns:tst="http://example.org/">
+
+<xsl:template match="tst:doc[5]">
+success
+</xsl:template>
+</xsl:stylesheet>
diff --git a/libxslt/tests/namespaces/tst3.out b/libxslt/tests/namespaces/tst3.out
new file mode 100644
index 0000000..3db52e1
--- /dev/null
+++ b/libxslt/tests/namespaces/tst3.out
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+     
+     
+     
+     
+     
+success
+
+     
+     
+     
+
diff --git a/libxslt/tests/namespaces/tst3.xml b/libxslt/tests/namespaces/tst3.xml
new file mode 100644
index 0000000..52fee9d
--- /dev/null
+++ b/libxslt/tests/namespaces/tst3.xml
@@ -0,0 +1,10 @@
+<a:tst xmlns:a="http://example.org/">
+     <a:doc/>
+     <a:doc/>
+     <a:doc/>
+     <a:doc/>
+     <a:doc>Failed</a:doc>
+     <a:doc/>
+     <a:doc/>
+     <a:doc/>
+</a:tst>
diff --git a/libxslt/tests/namespaces/tst3.xsl b/libxslt/tests/namespaces/tst3.xsl
new file mode 100644
index 0000000..a41435b
--- /dev/null
+++ b/libxslt/tests/namespaces/tst3.xsl
@@ -0,0 +1,9 @@
+<xsl:stylesheet version="1.0"
+	      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	      xmlns="http://www.w3.org/TR/xhtml1/strict"
+	      xmlns:tst="http://example.org/">
+
+<xsl:template match="tst:doc[5]">
+success
+</xsl:template>
+</xsl:stylesheet>
diff --git a/libxslt/tests/namespaces/tst4.out b/libxslt/tests/namespaces/tst4.out
new file mode 100644
index 0000000..37ef592
--- /dev/null
+++ b/libxslt/tests/namespaces/tst4.out
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+
+
+    matched html:* template
+  
+
diff --git a/libxslt/tests/namespaces/tst4.xml b/libxslt/tests/namespaces/tst4.xml
new file mode 100644
index 0000000..86962bf
--- /dev/null
+++ b/libxslt/tests/namespaces/tst4.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding="ISO-8859-1"?>
+<?xml-stylesheet href="style.xsl" type="text/xsl"?>
+<dummy xmlns:html="http://www.w3.org/1999/xhtml">
+<html:h1/>
+</dummy>
+
diff --git a/libxslt/tests/namespaces/tst4.xsl b/libxslt/tests/namespaces/tst4.xsl
new file mode 100644
index 0000000..a7b34f8
--- /dev/null
+++ b/libxslt/tests/namespaces/tst4.xsl
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:html="http://www.w3.org/1999/xhtml"
+  version="1.0">
+
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+  
+  <xsl:template match="html:*">
+    matched html:* template
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/libxslt/tests/namespaces/tst5.out b/libxslt/tests/namespaces/tst5.out
new file mode 100644
index 0000000..63167ea
--- /dev/null
+++ b/libxslt/tests/namespaces/tst5.out
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<windows xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <vbox flex="1">
+    <vbox>
+      <xhtml:div>Hello</xhtml:div>
+      <xhtml:div>
+                        foo
+                </xhtml:div>
+    </vbox>
+  </vbox>
+</windows>
diff --git a/libxslt/tests/namespaces/tst5.xml b/libxslt/tests/namespaces/tst5.xml
new file mode 100644
index 0000000..b04c670
--- /dev/null
+++ b/libxslt/tests/namespaces/tst5.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<a>
+hhhh
+</a>
diff --git a/libxslt/tests/namespaces/tst5.xsl b/libxslt/tests/namespaces/tst5.xsl
new file mode 100644
index 0000000..e974516
--- /dev/null
+++ b/libxslt/tests/namespaces/tst5.xsl
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:xhtml="http://www.w3.org/1999/xhtml"   >
+   <xsl:output method="xml" indent="yes" encoding="iso-8859-1" />
+   <xsl:template match="/">
+      <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+      <windows>
+        <vbox flex="1">
+                   <xsl:apply-templates />
+            </vbox>
+      </windows>
+   </xsl:template>
+   <xsl:template match="a">
+         <vbox>
+                <xhtml:div>Hello</xhtml:div>
+                <xsl:element name="xhtml:div">
+                        foo
+                </xsl:element>
+         </vbox>
+   </xsl:template>
+</xsl:stylesheet>
+
diff --git a/libxslt/tests/namespaces/tst6.out b/libxslt/tests/namespaces/tst6.out
new file mode 100644
index 0000000..31208ad
--- /dev/null
+++ b/libxslt/tests/namespaces/tst6.out
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<foo xmlns="urn:foo" xmlns:foo="urn:foo" xmlns:foo2="urn:foo2">
+  <bar>hello</bar>
+  <foo:baz>phaw</foo:baz>
+  <foo:bling xmlns="urn:foo2">
+    <bar2>hello2</bar2>
+  </foo:bling>
+  <bar>hello</bar>
+  <foo:baz>phaw</foo:baz>
+  <bling xmlns="urn:foo2">
+    <bar2>hello2</bar2>
+  </bling>
+</foo>
diff --git a/libxslt/tests/namespaces/tst6.xml b/libxslt/tests/namespaces/tst6.xml
new file mode 100644
index 0000000..7cfad8b
--- /dev/null
+++ b/libxslt/tests/namespaces/tst6.xml
@@ -0,0 +1,12 @@
+<foo xmlns="urn:foo" xmlns:foo="urn:foo" xmlns:foo2="urn:foo2">
+  <bar>hello</bar>
+  <foo:baz>phaw</foo:baz>
+  <foo:bling xmlns="urn:foo2">
+    <bar2>hello2</bar2>
+  </foo:bling>
+  <bar>hello</bar>
+  <foo:baz>phaw</foo:baz>
+  <bling xmlns="urn:foo2">
+    <bar2>hello2</bar2>
+  </bling>
+</foo>
diff --git a/libxslt/tests/namespaces/tst6.xsl b/libxslt/tests/namespaces/tst6.xsl
new file mode 100644
index 0000000..a2d4af1
--- /dev/null
+++ b/libxslt/tests/namespaces/tst6.xsl
@@ -0,0 +1,7 @@
+<xsl:transform
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version="1.0">
+  <xsl:template match="/">
+    <xsl:copy-of select="."/>
+  </xsl:template>     
+</xsl:transform>
diff --git a/libxslt/tests/namespaces/tst7.out b/libxslt/tests/namespaces/tst7.out
new file mode 100644
index 0000000..b86f605
--- /dev/null
+++ b/libxslt/tests/namespaces/tst7.out
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>
+                                        A title
+                                </title>
+  </head>
+  <body>
+                                        Some text
+                        </body>
+</html>
diff --git a/libxslt/tests/namespaces/tst7.xml b/libxslt/tests/namespaces/tst7.xml
new file mode 100644
index 0000000..ac9ac8f
--- /dev/null
+++ b/libxslt/tests/namespaces/tst7.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" ?>
+<adoc />
diff --git a/libxslt/tests/namespaces/tst7.xsl b/libxslt/tests/namespaces/tst7.xsl
new file mode 100644
index 0000000..47df7d9
--- /dev/null
+++ b/libxslt/tests/namespaces/tst7.xsl
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:html="http://www.w3.org/1999/xhtml">
+        <xsl:output method="xml" version="1.0" encoding="utf-8" indent="yes"
+doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" />
+        <xsl:namespace-alias stylesheet-prefix="html" result-prefix="#default" />
+        <xsl:strip-space elements="*" />
+        <xsl:template match="/adoc">
+                <html:html>
+                        <html:head>
+                                <html:title>
+                                        A title
+                                </html:title>
+                        </html:head>
+                        <html:body>
+                                        Some text
+                        </html:body>
+                </html:html>
+        </xsl:template>
+</xsl:stylesheet>
diff --git a/libxslt/tests/namespaces/tst8.out b/libxslt/tests/namespaces/tst8.out
new file mode 100644
index 0000000..5eabde5
--- /dev/null
+++ b/libxslt/tests/namespaces/tst8.out
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bb:root xmlns:bb="http://bbrack.org">
+  <element1 xmlns="http://delightful.com.hk">
+    <element2>Content 2</element2>
+  </element1>
+  <bb:element3>Content 3</bb:element3>
+</bb:root>
diff --git a/libxslt/tests/namespaces/tst8.xml b/libxslt/tests/namespaces/tst8.xml
new file mode 100644
index 0000000..ac9ac8f
--- /dev/null
+++ b/libxslt/tests/namespaces/tst8.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" ?>
+<adoc />
diff --git a/libxslt/tests/namespaces/tst8.xsl b/libxslt/tests/namespaces/tst8.xsl
new file mode 100644
index 0000000..52f2caa
--- /dev/null
+++ b/libxslt/tests/namespaces/tst8.xsl
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xsl:stylesheet version="1.0"
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:bb="http://bbrack.org">
+    <xsl:output method="xml" version="1.0" encoding="utf-8" indent="yes"/>
+    <xsl:namespace-alias
+        stylesheet-prefix="#default" 
+	result-prefix="bb" />
+    <xsl:strip-space elements="*" />
+    <xsl:template match="/adoc">
+        <root>
+	    <element1 xmlns="http://delightful.com.hk">
+	        <element2>Content 2</element2>
+	    </element1>
+	    <element3>Content 3</element3>
+	</root>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/libxslt/tests/namespaces/tst9.out b/libxslt/tests/namespaces/tst9.out
new file mode 100644
index 0000000..0d7d44b
--- /dev/null
+++ b/libxslt/tests/namespaces/tst9.out
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+
+
+
+
+
+
+
diff --git a/libxslt/tests/namespaces/tst9.xml b/libxslt/tests/namespaces/tst9.xml
new file mode 100644
index 0000000..69c8a85
--- /dev/null
+++ b/libxslt/tests/namespaces/tst9.xml
@@ -0,0 +1,11 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:ns="namespace"
+>
+
+<xsl:template name="test"/>
+
+<xsl:template name="ns:test"/>
+
+</xsl:stylesheet>
+
+
diff --git a/libxslt/tests/namespaces/tst9.xsl b/libxslt/tests/namespaces/tst9.xsl
new file mode 100644
index 0000000..69c8a85
--- /dev/null
+++ b/libxslt/tests/namespaces/tst9.xsl
@@ -0,0 +1,11 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:ns="namespace"
+>
+
+<xsl:template name="test"/>
+
+<xsl:template name="ns:test"/>
+
+</xsl:stylesheet>
+
+