diff options
Diffstat (limited to 'tests/auto/testlib/selftests/watchdog')
4 files changed, 12 insertions, 75 deletions
diff --git a/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt deleted file mode 100644 index 5183a6a934..0000000000 --- a/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Generated from watchdog.pro. - -##################################################################### -## watchdog Binary: -##################################################################### - -qt_internal_add_executable(watchdog - SOURCES - tst_watchdog.cpp - PUBLIC_LIBRARIES - Qt::Test -) - -#### Keys ignored in scope 1:.:.:watchdog.pro:<TRUE>: -# QT_TOOL_ENV = "checkenv" -# checkenv.name = "QTEST_FUNCTION_TIMEOUT" -# checkenv.value = "100" - -## Scopes: -##################################################################### diff --git a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt index 1515e50619..21beab6454 100644 --- a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt +++ b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt @@ -1,26 +1,21 @@ -# Generated from watchdog.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## watchdog Binary: ##################################################################### qt_internal_add_executable(watchdog - NO_INSTALL # special case - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case + NO_INSTALL + EXCEPTIONS + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} SOURCES tst_watchdog.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:watchdog.pro:<TRUE>: -# QT_TOOL_ENV = "checkenv" -# checkenv.name = "QTEST_FUNCTION_TIMEOUT" -# checkenv.value = "100" - ## Scopes: ##################################################################### -# special case begin qt_internal_apply_testlib_coverage_options(watchdog) -# special case end diff --git a/tests/auto/testlib/selftests/watchdog/tst_watchdog.cpp b/tests/auto/testlib/selftests/watchdog/tst_watchdog.cpp index 2f29609f71..2bc8853e00 100644 --- a/tests/auto/testlib/selftests/watchdog/tst_watchdog.cpp +++ b/tests/auto/testlib/selftests/watchdog/tst_watchdog.cpp @@ -1,32 +1,9 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include <QtTest/QtTest> +#include <QTest> + +using namespace std::chrono_literals; class tst_Watchdog : public QObject { @@ -38,10 +15,9 @@ private slots: void tst_Watchdog::delay() const { bool ok = false; - const int fiveMinutes = 5 * 60 * 1000; // Use the same env.var as the watch-dog and add a little to it: const int timeout = qEnvironmentVariableIntValue("QTEST_FUNCTION_TIMEOUT", &ok); - QTest::qSleep(5000 + (ok && timeout > 0 ? timeout : fiveMinutes)); + QTest::qSleep(5s + (ok && timeout > 0 ? timeout * 1ms : 5min)); // The watchdog timer should have interrupted us by now. QFAIL("ERROR: this function should be interrupted."); } diff --git a/tests/auto/testlib/selftests/watchdog/watchdog.pro b/tests/auto/testlib/selftests/watchdog/watchdog.pro deleted file mode 100644 index ddcc3f6ca2..0000000000 --- a/tests/auto/testlib/selftests/watchdog/watchdog.pro +++ /dev/null @@ -1,14 +0,0 @@ -SOURCES += tst_watchdog.cpp -QT = core testlib - -darwin: CONFIG -= app_bundle -CONFIG -= debug_and_release_target - -TARGET = watchdog - -# The test deliberately times out; so tell it to do so quickly -checkenv.name = QTEST_FUNCTION_TIMEOUT -checkenv.value = 100 -QT_TOOL_ENV += checkenv - -include($$QT_SOURCE_TREE/src/testlib/selfcover.pri) |