diff options
author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-05-15 16:21:39 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-19 15:52:58 +0200 |
commit | 1d7902a0caa77563d242e665e0a442e8afc6cf1c (patch) | |
tree | 2e16646b73353d75f5fb6f9b89b6beb64313bb79 /tests/auto | |
parent | 828656241bb69dc4c247796860963d88aa70ca5c (diff) |
Fix crash in QNetworkAccessManager.
Recreating QCoreApplication could cause a crash in QNetworkAccessManager
constructor. That was caused by an invalid shutdown detection introduced
in f273d6fbc02055ff3999adc0df76360ca0670435.
Task-number: QTBUG-36897
Change-Id: Ib5bba773a2a4fcde690a3a93680aef551aae3a5b
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Diffstat (limited to 'tests/auto')
3 files changed, 80 insertions, 0 deletions
diff --git a/tests/auto/network/bearer/bearer.pro b/tests/auto/network/bearer/bearer.pro index 872a818e4c..6ce922eaf8 100644 --- a/tests/auto/network/bearer/bearer.pro +++ b/tests/auto/network/bearer/bearer.pro @@ -2,5 +2,6 @@ TEMPLATE=subdirs SUBDIRS=\ qnetworkconfiguration \ qnetworkconfigurationmanager \ + qnetworkconfigurationmanagerqappless \ qnetworksession \ diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/qnetworkconfigurationmanagerqappless.pro b/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/qnetworkconfigurationmanagerqappless.pro new file mode 100644 index 0000000000..ad080910d7 --- /dev/null +++ b/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/qnetworkconfigurationmanagerqappless.pro @@ -0,0 +1,6 @@ +CONFIG += testcase +TARGET = tst_qnetworkconfigurationmanagerqappless +SOURCES += tst_qnetworkconfigurationmanagerqappless.cpp +HEADERS += ../qbearertestcommon.h + +QT = core network testlib diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/tst_qnetworkconfigurationmanagerqappless.cpp b/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/tst_qnetworkconfigurationmanagerqappless.cpp new file mode 100644 index 0000000000..eff2cb1642 --- /dev/null +++ b/tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/tst_qnetworkconfigurationmanagerqappless.cpp @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, 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, Digia gives you certain additional +** rights. These rights are described in the Digia 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtTest/QtTest> +#include <QtNetwork/qnetworkaccessmanager.h> + +QT_USE_NAMESPACE + +class tst_QNetworkConfigurationManager : public QObject +{ + Q_OBJECT + +private slots: + void staticsInitialization(); +}; + +void tst_QNetworkConfigurationManager::staticsInitialization() +{ + // This code should not crash. The test was introduced as + // a fix for https://bugreports.qt-project.org/browse/QTBUG-36897 + for (int i = 0; i < 2; i++) + { + int argc = 1; + const char *testName = "tst_qnetworkconfigurationmanagerqappless"; + char **argv = const_cast<char **>(&testName); + QCoreApplication app(argc, argv); + QNetworkAccessManager qnam; + Q_UNUSED(app); + Q_UNUSED(qnam); + } + QVERIFY(true); +} + +QTEST_APPLESS_MAIN(tst_QNetworkConfigurationManager) +#include "tst_qnetworkconfigurationmanagerqappless.moc" |