From d3399092dbe32f3b1a21fd2c13b2e530b4c9b1f6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 4 Jan 2021 12:20:13 +0200 Subject: [PATCH] tst_qdatastream: expect failure on 32bit system with large QBitArray Test data causes the QBitArray to be read as 0 byte length. Same issue on all 32bit systems, removing android blacklisting as this was the only one failing there. Task-number: QTBUG-87660 Change-Id: I63f0c1c6fa4e2242e6ebe70f50e422ab0fbf1c88 Reviewed-by: Allan Sandfeld Jensen --- tests/auto/corelib/serialization/qdatastream/BLACKLIST | 3 --- .../corelib/serialization/qdatastream/tst_qdatastream.cpp | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 tests/auto/corelib/serialization/qdatastream/BLACKLIST diff --git a/tests/auto/corelib/serialization/qdatastream/BLACKLIST b/tests/auto/corelib/serialization/qdatastream/BLACKLIST deleted file mode 100644 index b5ee66fe841..00000000000 --- a/tests/auto/corelib/serialization/qdatastream/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -# QTBUG-87660 -[status_QBitArray] -android diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp index 2b99c5eef6b..8fbe8d745ed 100644 --- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp @@ -3028,6 +3028,10 @@ void tst_QDataStream::status_QBitArray() QBitArray str; stream >> str; + if (sizeof(qsizetype) == sizeof(int)) + QEXPECT_FAIL("new badsize 0x10000", "size > INT_MAX fails on 32bit system (QTBUG-87660)", + Continue); + QCOMPARE(int(stream.status()), expectedStatus); QCOMPARE(str.size(), expectedString.size()); QCOMPARE(str, expectedString);