diff options
Diffstat (limited to 'tests/auto/xmlpatterns/tst_xmlpatterns.cpp')
| -rw-r--r-- | tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index e207a33..e182565 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -1,31 +1,26 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/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 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** 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. +** 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$ ** @@ -153,6 +148,10 @@ void tst_XmlPatterns::xquerySupport() if(!cwd.isEmpty()) process.setWorkingDirectory(inputFile(cwd)); + QProcessEnvironment env(process.processEnvironment()); + env.insert("QT_LOGGING_RULES", "qt.network.ssl=false"); + process.setProcessEnvironment(env); + process.start(m_command, arguments); QVERIFY2(process.waitForStarted(), msgProcessError("Failed to start", process).constData()); @@ -822,8 +821,10 @@ void tst_XmlPatterns::removeNonWritable(QFile &outFile) */ void tst_XmlPatterns::stdoutFailure() const { +#ifdef QT_NO_PROCESS + QSKIP("Skipping test due to not having process support"); +#else return; // TODO It's really hard to write testing code for this. -#ifndef QT_NO_PROCESS const QString outName(QLatin1String("stdoutFailure.out")); createNonWritable(outName); @@ -845,8 +846,6 @@ void tst_XmlPatterns::stdoutFailure() const QCOMPARE(process.exitCode(), 1); removeNonWritable(outFile); -#else - QSKIP("Skipping test due to not having process support"); #endif // QT_NO_PROCESS } |