From 848af97440730afcfab2ea48ca0c483fe9a9bb43 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Wed, 15 Dec 2021 18:20:01 +0100 Subject: QXmlStreamReader: update test distribution As mentioned in the linked bugreport, we are not allowed to distribute the uncompressed files from one of the XML test datasets that we use in our tests. This patch removes the uncompressed version, and replaces it by the xmltest.zip archive taken from [0]. Once the test is started, QZipReader is used to uncompress the archive, and once the test is done, the uncompressed data is removed. However the test data from [0] is very old, so it is slightly different from what we had previously (the previous data was taken from w3c). As a result, 4 test cases are failing with this data. To fix it, we store the updated versions of 4 xml files separately, and replace them after uncompressing the archive. [0]: http://www.jclark.com/xml/ Fixes: QTBUG-81503 Change-Id: Ied5233970a529deebca56b1eab07fe1c328a2ee0 Reviewed-by: Lars Knoll Reviewed-by: Qt CI Bot (cherry picked from commit f8b74a49576ea453b3bfc7356a23cd4f2171fa76) Reviewed-by: Alex Blasche --- .../qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml (limited to 'tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml') diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml new file mode 100755 index 0000000000..41eed46727 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml @@ -0,0 +1,4 @@ + +]> + \ No newline at end of file -- cgit v1.2.3 From a913bd51eef855b22faef91c4f40459a4cd82b21 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 14 Jan 2022 12:01:53 +0100 Subject: Remove execute permission from XML files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Files that are not meant to be executed should not have the execute permission bit set. Task-number: QTBUG-81503 Change-Id: I10666bd958adfc5c425216bcff7456facd1fe5f3 Reviewed-by: Mårten Nordheim Reviewed-by: Ievgenii Meshcheriakov (cherry picked from commit 6ee2664883391c14b44eb9f959782c96e42def8b) Reviewed-by: Qt Cherry-pick Bot --- .../qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml (limited to 'tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml') diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml old mode 100755 new mode 100644 -- cgit v1.2.3