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

tst_BenchlibCallgrind: fix x86 preprocessor check

Browse Source 
Its twoHundredMillionInstructions() test has #if-ery to limit it to
gcc and x86; however, it was testing only __i386 for the x86 part,
where gcc defines __x86_64 instead on modern 64-bit systems. In the
process, invert the condition and the branches it controls - positive
tests are easier to comprehend.

Change-Id: I8e906c606c48aa5034e02e3ed5d042fbb1f2ecbc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Edward Welbourne 2021-11-30 10:19:23 +01:00
parent d5c605b148
commit 9e835fe5a4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the test suite of the Qt Toolkit. ** This file is part of the test suite of the Qt Toolkit.
@ -62,9 +62,7 @@ void tst_BenchlibCallgrind::failInChildProcess()
void tst_BenchlibCallgrind::twoHundredMillionInstructions() void tst_BenchlibCallgrind::twoHundredMillionInstructions()
{ {
#if !defined(__GNUC__) || !defined(__i386) #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
QSKIP("This test is only defined for gcc and x86.");
#else
QBENCHMARK { QBENCHMARK {
__asm__ __volatile__( __asm__ __volatile__(
"mov $100000000,%%eax \n" "mov $100000000,%%eax \n"
@ -76,6 +74,8 @@ void tst_BenchlibCallgrind::twoHundredMillionInstructions()
: /* clobber */ "eax" : /* clobber */ "eax"
); );
} }
#else
QSKIP("This test is only implemented for gcc on x86.");
#endif #endif
} }