diff options
Diffstat (limited to 'tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp')
-rw-r--r-- | tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index 8d1fbf7c24..4881d86937 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -88,10 +88,8 @@ private slots: void threadedConnection_data(); void threadedConnection(); -#ifndef QT_NO_PROCESS void processConnection_data(); void processConnection(); -#endif void longPath(); void waitForDisconnect(); @@ -784,7 +782,6 @@ void tst_QLocalSocket::threadedConnection() } } -#ifndef QT_NO_PROCESS void tst_QLocalSocket::processConnection_data() { QTest::addColumn<int>("processes"); @@ -794,6 +791,7 @@ void tst_QLocalSocket::processConnection_data() QTest::newRow("30 clients") << 30; } +#ifndef QT_NO_PROCESS class ProcessOutputDumper { public: @@ -815,12 +813,16 @@ public: private: QProcess *process; }; +#endif /*! Create external processes that produce and consume. */ void tst_QLocalSocket::processConnection() { +#ifdef QT_NO_PROCESS + QSKIP("No qprocess support", SkipAll); +#else #ifdef Q_OS_MAC QSKIP("The processConnection test is unstable on Mac. See QTBUG-39986."); #endif @@ -860,8 +862,8 @@ void tst_QLocalSocket::processConnection() } producer.waitForFinished(15000); producerOutputDumper.clear(); -} #endif +} void tst_QLocalSocket::longPath() { |