AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace a random define with a __has_include() check

Browse Source 
The given reason for needing to define it was that there was no way to
test whether <valgrind/valgrind.h> is available to #include; but we
now require C++17 hence __has_include(). However, moc doesn't seem to
grok that, so move the test's #if-ery inside the test, since otherwise
it gets omitted because the test's metatype doesn't know it's there.

Change-Id: I75a100787b98a52fad4cfb0b047318a115c998e2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2021-09-28 14:15:41 +02:00
parent 197753d8ae
commit 4eb2dcd4b9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
View File

@ -30,9 +30,9 @@
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QTest> #include <QTest>
/* This test must be explicitly enabled since there are no compile tests for valgrind.h */ #if __has_include(<valgrind/valgrind.h>)
#ifdef QT_BUG236484 # include <valgrind/valgrind.h>
#include <valgrind/valgrind.h> # define HAVE_VALGRIND_H
#endif #endif
class tst_BenchlibCallgrind: public QObject class tst_BenchlibCallgrind: public QObject
@ -40,16 +40,14 @@ class tst_BenchlibCallgrind: public QObject
Q_OBJECT Q_OBJECT
private slots: private slots:
#ifdef QT_BUG236484
void failInChildProcess(); void failInChildProcess();
#endif
void twoHundredMillionInstructions(); void twoHundredMillionInstructions();
}; };
#ifdef QT_BUG236484
void tst_BenchlibCallgrind::failInChildProcess() void tst_BenchlibCallgrind::failInChildProcess()
{ {
#ifdef HAVE_VALGRIND_H
static double f = 1.0; static double f = 1.0;
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < 1000000; ++i) { for (int i = 0; i < 1000000; ++i) {
@ -57,8 +55,10 @@ void tst_BenchlibCallgrind::failInChildProcess()
if (RUNNING_ON_VALGRIND) QFAIL("Running under valgrind!"); if (RUNNING_ON_VALGRIND) QFAIL("Running under valgrind!");
} }
} }
} #else
QSKIP("Skipping test because I can't see <valgrind/valgrind.h> - is valgrind installed ?");
#endif #endif
}
void tst_BenchlibCallgrind::twoHundredMillionInstructions() void tst_BenchlibCallgrind::twoHundredMillionInstructions()
{ {
@ -89,4 +89,5 @@ int main(int argc, char *argv[])
QTEST_MAIN_IMPL(tst_BenchlibCallgrind) QTEST_MAIN_IMPL(tst_BenchlibCallgrind)
} }
#undef HAVE_VALGRIND_H
#include "tst_benchlibcallgrind.moc" #include "tst_benchlibcallgrind.moc"