diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-27 11:09:27 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 18:33:50 +0100 |
commit | ed8d8451c4174d9f200445c8476a9216be51af70 (patch) | |
tree | 87f5830e28b04ecddfded2da2aa9881166bf3209 /tests/auto/corelib/thread/qthreadstorage/crashOnExit.cpp | |
parent | 5a0eb4e768435b9ce32b074e620fca33be4df2fb (diff) |
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 <sergio.ahumada@nokia.com>
Diffstat (limited to 'tests/auto/corelib/thread/qthreadstorage/crashOnExit.cpp')
-rw-r--r-- | tests/auto/corelib/thread/qthreadstorage/crashOnExit.cpp | 65 |
1 files changed, 0 insertions, 65 deletions
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 <QtCore/QCoreApplication> -#include <QtCore/QThreadStorage> - -class Class -{ -public: - ~Class() - { - // trigger creation of a new QThreadStorage, after the previous QThreadStorage from main() was destructed - static QThreadStorage<int *> 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<int *> threadstorage; - threadstorage.setLocalData(new int); - threadstorage.setLocalData(new int); -} |