Revert "Fix network tests on qemu/arm"

SIOCGIFNAME is now supported on QEMU. This reverts commit 42b3ed7. Change-Id: I79caa371dc798464ab76851d2ea3189ec9eb0c57 Reviewed-by: Thiago Macieira <[email protected]>
Alegriabaile · Dec 18, 2020 · abd2cbc · abd2cbc
1 parent fe51137
commit abd2cbc
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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);
     }