diff options
Diffstat (limited to 'tests/auto/corelib/thread')
| -rw-r--r-- | tests/auto/corelib/thread/qatomicint/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/corelib/thread/qatomicint/BLACKLIST b/tests/auto/corelib/thread/qatomicint/BLACKLIST deleted file mode 100644 index 406fb7cc1c..0000000000 --- a/tests/auto/corelib/thread/qatomicint/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -# QTBUG-87422 -[alignment] -android diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp index 1f0d9e7779..5fbdc8a4d3 100644 --- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp +++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp @@ -242,7 +242,8 @@ void tst_QAtomicInt::alignment() QCOMPARE(alignof(QBasicAtomicInteger<char>), alignof(TypeInStruct<char>)); #endif -#ifdef Q_ATOMIC_INT64_IS_SUPPORTED +#if !defined(Q_PROCESSOR_X86_32) && defined(Q_ATOMIC_INT64_IS_SUPPORTED) + // The alignment is different on x86_32 QCOMPARE(alignof(QBasicAtomicInteger<qlonglong>), alignof(TypeInStruct<qlonglong>)); #endif } |