diff options
| author | Jonas M. Gastal <jgastal@profusion.mobi> | 2012-05-04 10:18:39 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-21 13:00:27 +0200 |
| commit | 2c790b251d9e3a30abe8ac63ab50f81c9c7631ce (patch) | |
| tree | ee36d0b9fb5e51673314689f0f714a1d40854978 /tests/auto/network/access | |
| parent | 63ed8bf07e11a7be236494608e91150e7f084028 (diff) | |
Fallback to IPv4 when IPv6 is not present.
In tests when IPv6 is not present QSKIP IPv6 tests.
Task-number: QTBUG-23660
Change-Id: I02abc7322d765a93cbf661e53c76257f03dca73e
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'tests/auto/network/access')
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/test/test.pro | 1 | ||||
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro index f267b09631..faa584ca6e 100644 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ b/tests/auto/network/access/qnetworkreply/test/test.pro @@ -8,7 +8,6 @@ contains(QT_CONFIG,xcb): CONFIG+=insignificant_test # unstable, QTBUG-21102 QT = core-private network-private testlib RESOURCES += ../qnetworkreply.qrc -contains(QT_CONFIG,ipv6ifname): DEFINES += HAVE_IPV6 TESTDATA += ../empty ../rfc3252.txt ../resource ../bigfile ../*.jpg ../certs \ ../index.html ../smb-file.txt diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index e3386406fc..2c02df0f13 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -2501,9 +2501,8 @@ void tst_QNetworkReply::connectToIPv6Address() QFETCH(QByteArray, dataToSend); QFETCH(QByteArray, hostfield); -#if !defined(HAVE_IPV6) && defined(Q_OS_UNIX) - QSKIP("system doesn't support ipv6!"); -#endif + if (!QtNetworkSettings::hasIPv6()) + QSKIP("system doesn't support ipv6!"); QByteArray httpResponse = QByteArray("HTTP/1.0 200 OK\r\nContent-Length: "); httpResponse += QByteArray::number(dataToSend.size()); |