diff options
Diffstat (limited to 'tests/auto/corelib/io/qprocessenvironment')
-rw-r--r-- | tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp | 22 |
2 files changed, 23 insertions, 7 deletions
diff --git a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt index 0ae3ac9549..02c6909031 100644 --- a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt @@ -5,7 +5,15 @@ ## tst_qprocessenvironment Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qprocessenvironment LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qprocessenvironment SOURCES tst_qprocessenvironment.cpp + LIBRARIES + Qt::TestPrivate ) diff --git a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp index 9bf8508697..560d4196b2 100644 --- a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp +++ b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp @@ -1,7 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QTest> +#include <QtTest/private/qcomparisontesthelper_p.h> #include <QObject> #include <QProcessEnvironment> @@ -9,6 +10,7 @@ class tst_QProcessEnvironment: public QObject { Q_OBJECT private slots: + void compareCompiles(); void operator_eq(); void clearAndIsEmpty(); void clearAndInheritsFromParent(); @@ -23,6 +25,11 @@ private slots: void putenv(); }; +void tst_QProcessEnvironment::compareCompiles() +{ + QTestPrivate::testEqualityOperatorsCompile<QProcessEnvironment>(); +} + void tst_QProcessEnvironment::operator_eq() { QProcessEnvironment e1; @@ -35,8 +42,7 @@ void tst_QProcessEnvironment::operator_eq() QCOMPARE(e1, e2); auto parentEnv = QProcessEnvironment(QProcessEnvironment::InheritFromParent); - QVERIFY(parentEnv != e2); - QVERIFY(e2 != parentEnv); + QT_TEST_EQUALITY_OPS(parentEnv, e2, false); e1.clear(); QCOMPARE(e1, e2); @@ -45,16 +51,15 @@ void tst_QProcessEnvironment::operator_eq() QCOMPARE(e1, e2); e1.insert("FOO", "bar"); - QVERIFY(e1 != e2); + QT_TEST_EQUALITY_OPS(e1, e2, false); e2.insert("FOO", "bar"); QCOMPARE(e1, e2); e2.insert("FOO", "baz"); - QVERIFY(e1 != e2); + QT_TEST_EQUALITY_OPS(e1, e2, false); - QVERIFY(e2 != parentEnv); - QVERIFY(parentEnv != e2); + QT_TEST_EQUALITY_OPS(e2, parentEnv, false); } void tst_QProcessEnvironment::clearAndIsEmpty() @@ -252,6 +257,9 @@ void tst_QProcessEnvironment::caseSensitivity() void tst_QProcessEnvironment::systemEnvironment() { +#ifdef Q_OS_VXWORKS + QSKIP("VxWorks do not have PATH environment variable"); +#endif static const char envname[] = "THIS_ENVIRONMENT_VARIABLE_HOPEFULLY_DOESNT_EXIST"; QByteArray path = qgetenv("PATH"); QByteArray nonexistant = qgetenv(envname); |