From ad9f748db5ceb390ca22fc9118d2cbe820a8146a Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Tue, 29 Mar 2022 17:52:27 +0200 Subject: Android: skip tst_QNetworkProxyFactory::genericSystemProxy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Android uses its own implementation of QNetworkProxyFactory, so the test of a generic implementation will never be working there. The "http_proxy" environment variable is simply ignored in Android's implementation. Fixes: QTBUG-87385 Pick-to: 6.3 6.2 Change-Id: I3c24e3481b70872d332310aa86c68adad9c2b7e6 Reviewed-by: Mårten Nordheim --- tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST | 3 --- .../network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST (limited to 'tests/auto/network') diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST b/tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST deleted file mode 100644 index 6e9d9ffdec..0000000000 --- a/tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -# QTBUG-87385 -[genericSystemProxy] -android diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp index 8b64788a73..d068c48e39 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp +++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp @@ -257,7 +257,7 @@ void tst_QNetworkProxyFactory::genericSystemProxy() QFETCH(int, port); // We can only use the generic system proxy where available: -#if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS) && !QT_CONFIG(libproxy) +#if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS) && !defined(Q_OS_ANDROID) && !QT_CONFIG(libproxy) qputenv(envVar, url); const QList systemProxy = QNetworkProxyFactory::systemProxyForQuery(); QCOMPARE(systemProxy.size(), 1); -- cgit v1.2.3