Remove xmlparse(document '') test

This one test was behaving differently between the ubuntu fix for
CVE-2015-7499 and the base "expected" file.  It's not worth having
yet another version of the expected file for this test, so drop it.
Perhaps at some point when all distros have settled down to the
same behavior on this test, it can be restored.

Problem found by me on libxml2 (2.9.1+dfsg1-3ubuntu4.6).
Solution suggested by Tom Lane.
Backpatch to 9.5, where the test was added.

diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
index 9b2d26441460360aa39b8e67ed46fbc4dff8470c..b451b63847e3e230b4a22a5ba93eb381a6fb2eab 100644 (file)
--- a/src/test/regress/expected/xml.out
+++ b/src/test/regress/expected/xml.out
@@ -263,17 +263,6 @@ SELECT xmlparse(content '');
  
 (1 row)
 
-SELECT xmlparse(document '');
-ERROR:  invalid XML document
-DETAIL:  line 1: switching encoding : no input
-
-^
-line 1: Document is empty
-
-^
-line 1: Start tag expected, '<' not found
-
-^
 SELECT xmlparse(document '   ');
 ERROR:  invalid XML document
 DETAIL:  line 1: Start tag expected, '<' not found

diff --git a/src/test/regress/expected/xml_1.out b/src/test/regress/expected/xml_1.out
index c7fa526f9cd309bf5b771c97f5a7bc3d48ab1bd1..d7027030c368e92ba716ae3e2cc27e041477ca22 100644 (file)
--- a/src/test/regress/expected/xml_1.out
+++ b/src/test/regress/expected/xml_1.out
@@ -204,10 +204,6 @@ SELECT xmlparse(content '');
 ERROR:  unsupported XML feature
 DETAIL:  This functionality requires the server to be built with libxml support.
 HINT:  You need to rebuild PostgreSQL using --with-libxml.
-SELECT xmlparse(document '');
-ERROR:  unsupported XML feature
-DETAIL:  This functionality requires the server to be built with libxml support.
-HINT:  You need to rebuild PostgreSQL using --with-libxml.
 SELECT xmlparse(document '   ');
 ERROR:  unsupported XML feature
 DETAIL:  This functionality requires the server to be built with libxml support.

diff --git a/src/test/regress/expected/xml_2.out b/src/test/regress/expected/xml_2.out
index 21d3de18b879e372ee4075f1f3aff849e90c8351..23c4e767f0bb9b212c094565e61f683c63dc3a55 100644 (file)
--- a/src/test/regress/expected/xml_2.out
+++ b/src/test/regress/expected/xml_2.out
@@ -251,10 +251,6 @@ SELECT xmlparse(content '');
  
 (1 row)
 
-SELECT xmlparse(document '');
-ERROR:  invalid XML document
-DETAIL:  line 1: switching encoding : no input
-line 1: Document is empty
 SELECT xmlparse(document '   ');
 ERROR:  invalid XML document
 DETAIL:  line 1: Start tag expected, '<' not found

diff --git a/src/test/regress/sql/xml.sql b/src/test/regress/sql/xml.sql
index 88764c88cdd1a204ee3b4f3fcef5f248151870c6..08a0b30067a88702ef770adcf741e832874515f2 100644 (file)
--- a/src/test/regress/sql/xml.sql
+++ b/src/test/regress/sql/xml.sql
@@ -71,7 +71,6 @@ SELECT xmlparse(content '');
 SELECT xmlparse(content '&idontexist;');
 SELECT xmlparse(content '');
 
-SELECT xmlparse(document '');
 SELECT xmlparse(document '   ');
 SELECT xmlparse(document 'abc');
 SELECT xmlparse(document 'x');