1 files changed, 9 insertions, 54 deletions
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