xinclude: Also test error messages

The reader interface with XIncludes is somewhat broken and can generate
different error messages. Start to move tests which are sketchy with
reader to a separate directory.

10 files changed, 31 insertions, 31 deletions

diff --git a/result/XInclude/fallback.xml.err b/result/XInclude/fallback.xml.err
new file mode 100644
index 00000000..68b5cc04
--- /dev/null
+++ b/result/XInclude/fallback.xml.err
@@ -0,0 +1 @@
+I/O warning : failed to load external entity "test/XInclude/docs/something.xml"
diff --git a/result/XInclude/fallback2.xml.err b/result/XInclude/fallback2.xml.err
new file mode 100644
index 00000000..5a35a2b1
--- /dev/null
+++ b/result/XInclude/fallback2.xml.err
@@ -0,0 +1,2 @@
+I/O warning : failed to load external entity "test/XInclude/docs/b.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/c.xml"
diff --git a/result/XInclude/fallback4.xml.err b/result/XInclude/fallback4.xml.err
new file mode 100644
index 00000000..2861bba7
--- /dev/null
+++ b/result/XInclude/fallback4.xml.err
@@ -0,0 +1 @@
+I/O warning : failed to load external entity "test/XInclude/docs/c.xml"
diff --git a/result/XInclude/fallback5.xml.err b/result/XInclude/fallback5.xml.err
new file mode 100644
index 00000000..84dd18e5
--- /dev/null
+++ b/result/XInclude/fallback5.xml.err
@@ -0,0 +1,16 @@
+I/O warning : failed to load external entity "test/XInclude/docs/a01.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a02.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a03.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a04.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a05.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a06.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a07.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a08.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a09.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a10.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a11.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a12.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a13.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a14.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a15.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/a16.xml"
diff --git a/result/XInclude/fallback6.xml.err b/result/XInclude/fallback6.xml.err
new file mode 100644
index 00000000..5a35a2b1
--- /dev/null
+++ b/result/XInclude/fallback6.xml.err
@@ -0,0 +1,2 @@
+I/O warning : failed to load external entity "test/XInclude/docs/b.xml"
+I/O warning : failed to load external entity "test/XInclude/docs/c.xml"
diff --git a/result/XInclude/nodes3.xml.err b/result/XInclude/nodes3.xml.err
new file mode 100644
index 00000000..fb115253
--- /dev/null
+++ b/result/XInclude/nodes3.xml.err
@@ -0,0 +1 @@
+./test/XInclude/docs/nodes3.xml:3: element include: XInclude error : Invalid fragment identifier in URI test/XInclude/ents/something.xml#xpointer(//p) use the xpointer attribute
diff --git a/result/XInclude/ns1.xml.err b/result/XInclude/ns1.xml.err
new file mode 100644
index 00000000..b05fffb3
--- /dev/null
+++ b/result/XInclude/ns1.xml.err
@@ -0,0 +1 @@
+I/O warning : failed to load external entity "test/XInclude/without-reader/b.xml"
diff --git a/result/XInclude/ns1.xml.rdr b/result/XInclude/ns1.xml.rdr
deleted file mode 100644
index 9a3a5e76..00000000
--- a/result/XInclude/ns1.xml.rdr
+++ /dev/null
@@ -1,23 +0,0 @@
-0 1 doc 0 0
-1 14 #text 0 1 
-    
-1 1 xi:include 1 0
-1 14 #text 0 1 
-    
-1 1 elem 0 0
-2 14 #text 0 1 
-        
-2 1 ns:elem 1 0
-2 14 #text 0 1 
-    
-1 15 elem 0 0
-1 14 #text 0 1 
-    
-1 14 #text 0 1 
-            
-1 1 ns:elem 1 0
-1 14 #text 0 1 
-        
-1 14 #text 0 1 
-
-0 15 doc 0 0
diff --git a/runtest.c b/runtest.c
index ff992951..d256ea31 100644
--- a/runtest.c
+++ b/runtest.c
@@ -4695,25 +4695,24 @@ testDesc testDescriptions[] = {
 #endif
 #ifdef LIBXML_XINCLUDE_ENABLED
     { "XInclude regression tests" ,
-      errParseTest, "./test/XInclude/docs/*", "result/XInclude/", "", NULL,
-      /* Ignore errors at this point ".err", */
+      errParseTest, "./test/XInclude/docs/*", "result/XInclude/", "", ".err",
       XML_PARSE_XINCLUDE },
 #ifdef LIBXML_READER_ENABLED
     { "XInclude xmlReader regression tests",
       streamParseTest, "./test/XInclude/docs/*", "result/XInclude/", ".rdr",
-      /* Ignore errors at this point ".err", */
-      NULL, XML_PARSE_XINCLUDE },
+      ".err", XML_PARSE_XINCLUDE },
 #endif
     { "XInclude regression tests stripping include nodes" ,
-      errParseTest, "./test/XInclude/docs/*", "result/XInclude/", "", NULL,
-      /* Ignore errors at this point ".err", */
+      errParseTest, "./test/XInclude/docs/*", "result/XInclude/", "", ".err",
       XML_PARSE_XINCLUDE | XML_PARSE_NOXINCNODE },
 #ifdef LIBXML_READER_ENABLED
     { "XInclude xmlReader regression tests stripping include nodes",
       streamParseTest, "./test/XInclude/docs/*", "result/XInclude/", ".rdr",
-      /* Ignore errors at this point ".err", */
-      NULL, XML_PARSE_XINCLUDE | XML_PARSE_NOXINCNODE },
+      ".err", XML_PARSE_XINCLUDE | XML_PARSE_NOXINCNODE },
 #endif
+    { "XInclude regression tests without reader",
+      errParseTest, "./test/XInclude/without-reader/*", "result/XInclude/", "",
+      ".err", XML_PARSE_XINCLUDE },
 #endif
 #ifdef LIBXML_XPATH_ENABLED
 #ifdef LIBXML_DEBUG_ENABLED
diff --git a/test/XInclude/docs/ns1.xml b/test/XInclude/without-reader/ns1.xml
index 7523f4a9..7523f4a9 100644
--- a/test/XInclude/docs/ns1.xml
+++ b/test/XInclude/without-reader/ns1.xml