1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_qobject: fix the detection for GCC

Browse Source 
Q_CC_GNU is defined on compilers that masquerade as GCC (Clang, ICC),
so using it to work around GCC-specific bugs is wrong. Introduce a
local define for _only_ GCC and use it in place of Q_CC_GNU.

Drive by: version-fence a test we now know it's been fixed upstream,
and correct the link to the corresponding bug report.

Change-Id: I9059d6e6bf86157aca71590ac22afb1a1c114313
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 8b9c8d417b8ff2d4f60d83f9cc69c148632d1046)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Giuseppe D'Angelo 2021-03-26 14:11:30 +01:00 committed by Qt Cherry-pick Bot
parent e2a7381641
commit 59ab5b29b3
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/auto/corelib/kernel/qobject/tst_qobject.cpp
View File

@ -7047,6 +7047,12 @@ void tst_QObject::mutableFunctor()
void tst_QObject::checkArgumentsForNarrowing() void tst_QObject::checkArgumentsForNarrowing()
{ {
// Clang and ICC masquerade as GCC, so introduce a more strict define
// for exactly GCC (to exclude/include it from some tests).
#if defined(Q_CC_GNU) && !defined(Q_CC_CLANG) && !defined(Q_CC_INTEL)
#define Q_CC_EXACTLY_GCC Q_CC_GNU
#endif
enum UnscopedEnum { UnscopedEnumV1 = INT_MAX, UnscopedEnumV2 }; enum UnscopedEnum { UnscopedEnumV1 = INT_MAX, UnscopedEnumV2 };
enum SignedUnscopedEnum { SignedUnscopedEnumV1 = INT_MIN, SignedUnscopedEnumV2 = INT_MAX }; enum SignedUnscopedEnum { SignedUnscopedEnumV1 = INT_MIN, SignedUnscopedEnumV2 = INT_MAX };
@ -7064,7 +7070,7 @@ void tst_QObject::checkArgumentsForNarrowing()
// GCC < 9 does not consider floating point to bool to be narrowing, // GCC < 9 does not consider floating point to bool to be narrowing,
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65043 // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65043
#if !defined(Q_CC_GNU) || Q_CC_GNU >= 900 #if !defined(Q_CC_EXACTLY_GCC) || Q_CC_EXACTLY_GCC >= 900
NARROWS(float, bool); NARROWS(float, bool);
NARROWS(double, bool); NARROWS(double, bool);
NARROWS(long double, bool); NARROWS(long double, bool);
@ -7097,10 +7103,10 @@ void tst_QObject::checkArgumentsForNarrowing()
FITS(float, double); FITS(float, double);
FITS(float, long double); FITS(float, long double);
// GCC thinks this is narrowing only on architectures where // GCC < 11 thinks this is narrowing only on architectures where
// sizeof(long double) > sizeof(double) // sizeof(long double) > sizeof(double)
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92856 // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94590
#if defined(Q_CC_GNU) #if defined(Q_CC_EXACTLY_GCC) && (Q_CC_EXACTLY_GCC < 1100)
NARROWS_IF(long double, double, sizeof(long double) > sizeof(double)); NARROWS_IF(long double, double, sizeof(long double) > sizeof(double));
#else #else
NARROWS(long double, double); NARROWS(long double, double);
@ -7374,6 +7380,10 @@ void tst_QObject::checkArgumentsForNarrowing()
#undef FITS_IF #undef FITS_IF
#undef NARROWS #undef NARROWS
#undef FITS #undef FITS
#ifdef Q_CC_EXACTLY_GCC
#undef Q_CC_EXACTLY_GCC
#endif
} }
void tst_QObject::nullReceiver() void tst_QObject::nullReceiver()