[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-6ubuntu1-5-g31ff7c9

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=31ff7c9

The following commit has been merged in the ubuntu branch:
commit 31ff7c9c7a0822558107894e64d4a45b0bce856c
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Dec 7 13:28:53 2015 +0000

    Adjust tests to the new files.
---
 debian/changelog                  |  2 ++
 debian/patches/enable-tests.patch | 72 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c90f2bd..0a4075b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtbase-opensource-src (5.5.1+dfsg-6ubuntu3) UNRELEASED; urgency=medium
 
   * debian/patches/enable-tests.patch:
     - Replace the non-DFSG-free RFC files with public domain content.
+    - Adjust tests to the new files.
+    (LP: #1522442)
   * debian/copyright: mention the replacement.
   * Switch to opt-in for architectures to run tests on.
 
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index e4ccdf6..29abcec 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -23510,3 +23510,75 @@ diff -urN qtbase-opensource-src-5.5.1.old/tests/auto/gui/kernel/qtouchevent/tst_
      QGraphicsScene scene;
      QGraphicsView view(&scene);
      view.setWindowTitle(QTest::currentTestFunction());
+diff -urN qtbase-opensource-src-5.5.1.old/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp qtbase-opensource-src-5.5.1/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
+--- qtbase-opensource-src-5.5.1.old/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp	2015-10-13 04:35:19.000000000 +0000
++++ qtbase-opensource-src-5.5.1/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp	2015-12-07 08:32:21.199285582 +0000
+@@ -829,7 +829,7 @@
+     QVERIFY(file.open(QFile::ReadOnly));
+ 
+     QTextStream stream(&file);
+-    for (int i = 0; i < 15066; ++i) {
++    for (int i = 0; i < 20271; ++i) {
+         QString line = stream.readLine();
+         QVERIFY(!line.isNull());
+         QVERIFY(!line.isNull());
+@@ -945,7 +945,7 @@
+     QTest::newRow("buffersize+2 line") << QByteArray(16385, '
') << 16385;
+ 
+     QFile file(m_rfc3261FilePath); file.open(QFile::ReadOnly);
+-    QTest::newRow("rfc3261") << file.readAll() << 15067;
++    QTest::newRow("rfc3261") << file.readAll() << 20272;
+ }
+ 
+ // ------------------------------------------------------------------------------
+@@ -1251,26 +1251,26 @@
+     QTextStream stream(&file);
+     QString tmp;
+     stream >> tmp;
+-    QCOMPARE(tmp, QString::fromLatin1("Network"));
++    QCOMPARE(tmp, QString::fromLatin1("IN"));
+ 
+     // QTextStream::seek(0) should both clear its internal read/write buffers
+     // and seek the device.
+     for (int i = 0; i < 4; ++i) {
+         stream.seek(12 + i);
+         stream >> tmp;
+-        QCOMPARE(tmp, QString("Network").mid(i));
++        QCOMPARE(tmp, QString("times,").mid(i));
+     }
+     for (int i = 0; i < 4; ++i) {
+         stream.seek(16 - i);
+         stream >> tmp;
+-        QCOMPARE(tmp, QString("Network").mid(4 - i));
++        QCOMPARE(tmp, QString("times,").mid(4 - i));
+     }
+     stream.seek(139181);
+     stream >> tmp;
+-    QCOMPARE(tmp, QString("information"));
++    QCOMPARE(tmp, QString("th"));
+     stream.seek(388683);
+     stream >> tmp;
+-    QCOMPARE(tmp, QString("telephone"));
++    QCOMPARE(tmp, QString("trong,"));
+ 
+     // Also test this with a string
+     QString words = QLatin1String("thisisa");
+@@ -1358,14 +1358,14 @@
+ 
+         QString strtmp;
+         stream >> strtmp;
+-        QCOMPARE(strtmp, QString("Network"));
+-        QCOMPARE(stream.pos(), qint64(19));
++        QCOMPARE(strtmp, QString("IN"));
++        QCOMPARE(stream.pos(), qint64(2));
+ 
+         stream.seek(2598);
+         QCOMPARE(stream.pos(), qint64(2598));
+         stream >> strtmp;
+-        QCOMPARE(stream.pos(), qint64(2607));
+-        QCOMPARE(strtmp, QString("locations"));
++        QCOMPARE(stream.pos(), qint64(2599));
++        QCOMPARE(strtmp, QString(","));
+     }
+     {
+         // Shift-JIS device

-- 
qtbase packaging