From 8403fc7796aca7b6f45a88ecaef6485f731dc431 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 22 Mar 2021 08:32:45 +0100 Subject: Make it even more obvious on what to do when tst_toolsupport fails Triggered by 6778b247. Pick-to: 6.0 6.1 5.15 Change-Id: Ic8e7136cd82eb8d3891450cfa8994f43b7cc09fc Reviewed-by: Fabian Kosmale --- tests/auto/other/toolsupport/tst_toolsupport.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tests/auto/other') diff --git a/tests/auto/other/toolsupport/tst_toolsupport.cpp b/tests/auto/other/toolsupport/tst_toolsupport.cpp index 91c3ef0149..2e46f022e7 100644 --- a/tests/auto/other/toolsupport/tst_toolsupport.cpp +++ b/tests/auto/other/toolsupport/tst_toolsupport.cpp @@ -101,12 +101,14 @@ void tst_toolsupport::offsets_data() { QTestData &data = QTest::newRow("sizeof(QObjectData)") << sizeof(QObjectData); + // Please heed the comment at the top of this file when changing this line: data << 44 << 80; // vptr + 2 ptr + (2*ptr + int) + 2 int + ptr } { QTestData &data = QTest::newRow("sizeof(QObjectPrivate::ExtraData)") << sizeof(QObjectPrivate::ExtraData); + // Please heed the comment at the top of this file when changing this line: data << 60 << 120; // 4 * QList + 1 * QString } @@ -114,18 +116,21 @@ void tst_toolsupport::offsets_data() { QTestData &data = QTest::newRow("QObjectPrivate::extraData") << pmm_to_offsetof(&QObjectPrivate::extraData); + // Please heed the comment at the top of this file when changing this line: data << 44 << 80; // sizeof(QObjectData) } { QTestData &data = QTest::newRow("QFileInfoPrivate::fileEntry") << pmm_to_offsetof(&QFileInfoPrivate::fileEntry); + // Please heed the comment at the top of this file when changing this line: data << 4 << 8; } { QTestData &data = QTest::newRow("QFileSystemEntry::filePath") << pmm_to_offsetof(&QFileSystemEntry::m_filePath); + // Please heed the comment at the top of this file when changing this line: data << 0 << 0; } @@ -133,6 +138,7 @@ void tst_toolsupport::offsets_data() { QTestData &data = QTest::newRow("QFilePrivate::fileName") << pmm_to_offsetof(&QFilePrivate::fileName); + // Please heed the comment at the top of this file when changing one of these lines: #ifdef Q_PROCESSOR_X86 // x86 32-bit has weird alignment rules. Refer to QtPrivate::AlignOf in // qglobal.h for more details. @@ -144,6 +150,7 @@ void tst_toolsupport::offsets_data() #endif { + // Please heed the comment at the top of this file when changing one of these lines: QTest::newRow("QDateTimePrivate::m_msecs") << pmm_to_offsetof(&QDateTimePrivate::m_msecs) << 8 << 8; QTest::newRow("QDateTimePrivate::m_status") -- cgit v1.2.3