From ed8d8451c4174d9f200445c8476a9216be51af70 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 27 Feb 2012 11:09:27 +0100 Subject: Fix QThreadstorage test. - Create subdirectories containing profiles to avoid problems with -fast. - Use QFINDTESTDATA to locate binary. - Make it a console application, no Mac-bundle. - Add error messages to the test, give it a longer time-out and ensure sub-process is killed if it hangs. Change-Id: Ibc177b786c4bc8fdbc068a8c45f4801a41c9f660 Reviewed-by: Sergio Ahumada --- .../corelib/thread/qthreadstorage/crashOnExit.cpp | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 tests/auto/corelib/thread/qthreadstorage/crashOnExit.cpp (limited to 'tests/auto/corelib/thread/qthreadstorage/crashOnExit.cpp') diff --git a/tests/auto/corelib/thread/qthreadstorage/crashOnExit.cpp b/tests/auto/corelib/thread/qthreadstorage/crashOnExit.cpp deleted file mode 100644 index 388c233d84..0000000000 --- a/tests/auto/corelib/thread/qthreadstorage/crashOnExit.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -class Class -{ -public: - ~Class() - { - // trigger creation of a new QThreadStorage, after the previous QThreadStorage from main() was destructed - static QThreadStorage threadstorage; - threadstorage.setLocalData(new int); - threadstorage.setLocalData(new int); - } -}; - -int main() -{ - // instantiate the class that will use QThreadStorage from its destructor, it's destructor will be run last - static Class instance; - // instantiate QThreadStorage, it's destructor (and the global destructors for QThreadStorages internals) will run first - static QThreadStorage threadstorage; - threadstorage.setLocalData(new int); - threadstorage.setLocalData(new int); -} -- cgit v1.2.3