summaryrefslogtreecommitdiffstats
path: root/tests/auto/testlib/selftests/benchlibcallgrind
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/testlib/selftests/benchlibcallgrind')
-rw-r--r--tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt9
-rw-r--r--tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp6
2 files changed, 6 insertions, 9 deletions
diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
index 17cceb798b..033724406c 100644
--- a/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt
@@ -1,15 +1,14 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-# Generated from benchlibcallgrind.pro.
-
#####################################################################
## benchlibcallgrind Binary:
#####################################################################
qt_internal_add_executable(benchlibcallgrind
- NO_INSTALL # special case
- OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
+ NO_INSTALL
+ EXCEPTIONS
+ OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
SOURCES
tst_benchlibcallgrind.cpp
LIBRARIES
@@ -19,6 +18,4 @@ qt_internal_add_executable(benchlibcallgrind
## Scopes:
#####################################################################
-# special case begin
qt_internal_apply_testlib_coverage_options(benchlibcallgrind)
-# special case end
diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp b/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
index 8ced6f28e5..fc7f0b013b 100644
--- a/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QTest>
#include <QtCore/QCoreApplication>
@@ -22,7 +22,7 @@ private slots:
void tst_BenchlibCallgrind::failInChildProcess()
{
#ifdef HAVE_VALGRIND_H
- static double f = 1.0;
+ [[maybe_unused]] static double f = 1.0;
QBENCHMARK {
for (int i = 0; i < 1000000; ++i) {
f *= 1.1;
@@ -63,7 +63,7 @@ QTEST_MAIN_WRAPPER(tst_BenchlibCallgrind,
|| qstrcmp(arg, "-callgrind") == 0;
}) == args.end()) {
args.push_back("-callgrind");
- argc = args.size();
+ argc = int(args.size());
argv = const_cast<char**>(&args[0]);
}
QTEST_MAIN_SETUP())