whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tests: fix qlogging build fail for Android 

The macro BACKTRACE_HELPER_NAME is defined inside a block with
#ifdef __GLIBC__ which is not defined on Android, thus causing the test
to fail on Android.

Change-Id: I55e9b3e3bae2da182481239ad88107c36e3bd438
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
bb10
Assam Boudjelthia 2020-09-15 11:38:05 +03:00
parent 6b9a2937d6
commit 3bab2d234e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/auto/corelib/global/qlogging/tst_qlogging.cpp
View File

@ -737,6 +737,12 @@ void tst_qmessagehandler::qMessagePattern_data()
QTest::newRow("time-process") << "<%{time process}>%{message}" << true << (QList<QByteArray>()
<< "< ");
#ifdef QT_CMAKE_BUILD
#define BACKTRACE_HELPER_NAME "qlogging_helper"
#else
#define BACKTRACE_HELPER_NAME "helper"
#endif
#ifdef __GLIBC__
#ifdef QT_NAMESPACE
#define QT_NAMESPACE_STR QT_STRINGIFY(QT_NAMESPACE::)
@ -744,13 +750,6 @@ void tst_qmessagehandler::qMessagePattern_data()
#define QT_NAMESPACE_STR ""
#endif
#ifdef QT_CMAKE_BUILD
#define BACKTRACE_HELPER_NAME "qlogging_helper"
#else
#define BACKTRACE_HELPER_NAME "helper"
#endif
#ifndef QT_NO_DEBUG
QTest::newRow("backtrace") << "[%{backtrace}] %{message}" << true << (QList<QByteArray>()
// MyClass::qt_static_metacall is explicitly marked as hidden in the Q_OBJECT macro