whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix network tests on qemu/arm" 

SIOCGIFNAME is now supported on QEMU.
This reverts commit 42b3ed763f.

Change-Id: I79caa371dc798464ab76851d2ea3189ec9eb0c57
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Samuli Piippo 2020-12-14 12:33:16 +02:00
parent fe51137f85
commit abd2cbc12a
3 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/network/kernel/qnetworkinterface/CMakeLists.txt
View File

@ -6,10 +6,7 @@
qt_internal_add_test(tst_qnetworkinterface
SOURCES
../../../../shared/emulationdetector.h
tst_qnetworkinterface.cpp
INCLUDE_DIRECTORIES
../../../../shared
PUBLIC_LIBRARIES
Qt::Network
)

2
tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro
View File

@ -1,7 +1,5 @@
CONFIG += testcase
TARGET = tst_qnetworkinterface
SOURCES += tst_qnetworkinterface.cpp
INCLUDEPATH += ../../../../shared/
HEADERS += ../../../../shared/emulationdetector.h
QT = core network testlib

3
tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
View File

@ -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);
}