diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-02-07 11:45:06 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-02-09 14:27:20 +0100 |
| commit | 85416ae6fd9da00540e471e5b0864a3e1678f423 (patch) | |
| tree | 6d637033fac75defdc83a44de93f3d2f8b14a45f /tests/auto/other | |
| parent | 2861cfb6f851d7cee503b19f0e800a33374db66c (diff) | |
Split up the QMetaType unit test
gcc 9 consumed enourmous amounts of memory building the test, regularly
dying on a VM with 4GB RAM. Splitting it up helps.
As a drive-by, use inline static variables, and rename the header used by
other tests to tst_qmetatype_common.h.
Change-Id: Ib716d8e3506aac6c87845e57b04cb1a4f6c68387
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/qvariant_common/tst_qvariant_common.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/other/qvariant_common/tst_qvariant_common.h b/tests/auto/other/qvariant_common/tst_qvariant_common.h index 7851bf8dcc..70a44ad10f 100644 --- a/tests/auto/other/qvariant_common/tst_qvariant_common.h +++ b/tests/auto/other/qvariant_common/tst_qvariant_common.h @@ -72,11 +72,9 @@ protected: } QtMessageHandler oldMsgHandler; - static int currentId; - static bool ok; + inline static int currentId = {}; + inline static bool ok = {}; }; -bool MessageHandler::ok; -int MessageHandler::currentId; #define TST_QVARIANT_CANCONVERT_DATATABLE_HEADERS \ QTest::addColumn<QVariant>("val"); \ |