diff options
Diffstat (limited to 'tests/auto/corelib/io/qprocess/testProcessCrash')
4 files changed, 13 insertions, 76 deletions
diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt deleted file mode 100644 index d09e1364fb..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessCrash/.prev_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Generated from testProcessCrash.pro. - -##################################################################### -## testProcessCrash Binary: -##################################################################### - -qt_add_executable(testProcessCrash - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" - SOURCES - main.cpp - PUBLIC_LIBRARIES - Qt::Gui -) diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt index 1b2ab3eac5..2f167899eb 100644 --- a/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocess/testProcessCrash/CMakeLists.txt @@ -1,13 +1,13 @@ -# Generated from testProcessCrash.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## testProcessCrash Binary: ##################################################################### -qt_add_executable(testProcessCrash +qt_internal_add_executable(testProcessCrash OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + CORE_LIBRARY None SOURCES main.cpp - #PUBLIC_LIBRARIES # special case remove - #Qt::Gui # special case remove ) diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/main.cpp b/tests/auto/corelib/io/qprocess/testProcessCrash/main.cpp index 298a74d2b0..a5f1eef88a 100644 --- a/tests/auto/corelib/io/qprocess/testProcessCrash/main.cpp +++ b/tests/auto/corelib/io/qprocess/testProcessCrash/main.cpp @@ -1,59 +1,14 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2020 Intel Corporation. -** 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) 2016 The Qt Company Ltd. +// Copyright (C) 2020 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -void crashFallback(volatile int *ptr = nullptr) -{ - *ptr = 0; -} - -#if defined(_MSC_VER) -# include <intrin.h> - -int main() -{ -# if defined(_M_IX86) || defined(_M_X64) - __ud2(); -# endif - - crashFallback(); -} -#elif defined(__MINGW32__) -int main() -{ - asm("ud2"); - crashFallback(); -} -#else -# include <stdlib.h> +#include "../crasher.h" +using namespace tst_QProcessCrash; int main() { - abort(); + [[maybe_unused]] // NoCoreDumps may be an empty struct, not a RAII class + NoCoreDumps disableCoreDumps; + crash(); + return 0; } -#endif diff --git a/tests/auto/corelib/io/qprocess/testProcessCrash/testProcessCrash.pro b/tests/auto/corelib/io/qprocess/testProcessCrash/testProcessCrash.pro deleted file mode 100644 index 640ce4cd09..0000000000 --- a/tests/auto/corelib/io/qprocess/testProcessCrash/testProcessCrash.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES = main.cpp -CONFIG += cmdline -CONFIG -= qt - -DESTDIR = ./ |