diff options
Diffstat (limited to 'tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp')
| -rw-r--r-- | tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp | 76 |
1 files changed, 28 insertions, 48 deletions
diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp b/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp index bd3a27ec24..fc7f0b013b 100644 --- a/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp +++ b/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp @@ -1,38 +1,12 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only - -#include <QtCore/QCoreApplication> #include <QTest> +#include <QtCore/QCoreApplication> -/* This test must be explicitly enabled since there are no compile tests for valgrind.h */ -#ifdef QT_BUG236484 -#include <valgrind/valgrind.h> +#if __has_include(<valgrind/valgrind.h>) +# include <valgrind/valgrind.h> +# define HAVE_VALGRIND_H #endif class tst_BenchlibCallgrind: public QObject @@ -40,31 +14,29 @@ class tst_BenchlibCallgrind: public QObject Q_OBJECT private slots: -#ifdef QT_BUG236484 void failInChildProcess(); -#endif void twoHundredMillionInstructions(); }; -#ifdef QT_BUG236484 void tst_BenchlibCallgrind::failInChildProcess() { - static double f = 1.0; +#ifdef HAVE_VALGRIND_H + [[maybe_unused]] static double f = 1.0; QBENCHMARK { for (int i = 0; i < 1000000; ++i) { f *= 1.1; if (RUNNING_ON_VALGRIND) QFAIL("Running under valgrind!"); } } -} +#else + QSKIP("Skipping test because I can't see <valgrind/valgrind.h> - is valgrind installed ?"); #endif +} void tst_BenchlibCallgrind::twoHundredMillionInstructions() { -#if !defined(__GNUC__) || !defined(__i386) - QSKIP("This test is only defined for gcc and x86."); -#else +#if defined(__GNUC__) && (defined(__i386) || defined(__x86_64)) QBENCHMARK { __asm__ __volatile__( "mov $100000000,%%eax \n" @@ -76,17 +48,25 @@ void tst_BenchlibCallgrind::twoHundredMillionInstructions() : /* clobber */ "eax" ); } +#else + QSKIP("This test is only implemented for gcc on x86."); #endif } -int main(int argc, char *argv[]) -{ +QTEST_MAIN_WRAPPER(tst_BenchlibCallgrind, std::vector<const char*> args(argv, argv + argc); - args.push_back("-callgrind"); - argc = args.size(); - argv = const_cast<char**>(&args[0]); - - QTEST_MAIN_IMPL(tst_BenchlibCallgrind) -} + // Add the -callgrind argument unless (it's there anyway or) we're the + // recursive invocation with -callgrindchild passed. + if (std::find_if(args.begin(), args.end(), + [](const char *arg) { + return qstrcmp(arg, "-callgrindchild") == 0 + || qstrcmp(arg, "-callgrind") == 0; + }) == args.end()) { + args.push_back("-callgrind"); + argc = int(args.size()); + argv = const_cast<char**>(&args[0]); + } + QTEST_MAIN_SETUP()) +#undef HAVE_VALGRIND_H #include "tst_benchlibcallgrind.moc" |