diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-12-14 12:33:16 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-12-18 11:18:44 +0200 |
| commit | abd2cbc12a28f2e962827ac9608d9e0bef6f0489 (patch) | |
| tree | 8b7bfeae8c0aa20cc898bf9d42e72806f39b0978 /tests/auto/network/kernel | |
| parent | fe51137f859948472571ce4c879955eb74c77716 (diff) | |
Revert "Fix network tests on qemu/arm"
SIOCGIFNAME is now supported on QEMU.
This reverts commit 42b3ed763f989da94a776fd39f9726d2effc5cb1.
Change-Id: I79caa371dc798464ab76851d2ea3189ec9eb0c57
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/network/kernel')
3 files changed, 0 insertions, 8 deletions
diff --git a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt index ecce69cb04..0c667781e9 100644 --- a/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt +++ b/tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt @@ -6,10 +6,7 @@ qt_internal_add_test(tst_qnetworkinterface SOURCES - ../../../../shared/emulationdetector.h tst_qnetworkinterface.cpp - INCLUDE_DIRECTORIES - ../../../../shared PUBLIC_LIBRARIES Qt::Network ) diff --git a/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro index bbcf60b828..694dec2ed7 100644 --- a/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro +++ b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro @@ -1,7 +1,5 @@ CONFIG += testcase TARGET = tst_qnetworkinterface SOURCES += tst_qnetworkinterface.cpp -INCLUDEPATH += ../../../../shared/ -HEADERS += ../../../../shared/emulationdetector.h QT = core network testlib diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp index 35d593ff9b..b10d37f4cd 100644 --- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp +++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp @@ -34,7 +34,6 @@ #include <qnetworkinterface.h> #include <qudpsocket.h> #include "../../../network-settings.h" -#include "emulationdetector.h" Q_DECLARE_METATYPE(QHostAddress) @@ -277,8 +276,6 @@ void tst_QNetworkInterface::interfaceFromXXX() QVERIFY(QNetworkInterface::interfaceFromName(iface.name()).isValid()); if (int idx = iface.index()) { QVERIFY(QNetworkInterface::interfaceFromIndex(idx).isValid()); - if (EmulationDetector::isRunningArmOnX86()) - QEXPECT_FAIL("", "SIOCGIFNAME fails on QEMU", Continue); QCOMPARE(QNetworkInterface::interfaceNameFromIndex(idx), iface.name()); QCOMPARE(QNetworkInterface::interfaceIndexFromName(iface.name()), idx); } |