tests: remove unnecessary skips for qemu

QEMU sysroots are now root owned. Change-Id: Id829cb5debc449efee929ef83876e6ffbf78332c Reviewed-by: Assam Boudjelthia <[email protected]>
Alegriabaile · Jan 28, 2021 · d5a2046 · d5a2046
1 parent dac4d5a
commit d5a2046
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 23 deletions.
diff --git a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt
@@ -6,10 +6,7 @@
 
 qt_internal_add_test(tst_qtemporarydir
     SOURCES
-        ../../../../shared/emulationdetector.h
         tst_qtemporarydir.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../shared
     PUBLIC_LIBRARIES
         Qt::TestPrivate
 )
diff --git a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
@@ -43,7 +43,6 @@
 # include <sys/types.h>
 # include <unistd.h>
 #endif
-#include "emulationdetector.h"
 
 class tst_QTemporaryDir : public QObject
 {
@@ -311,12 +310,6 @@ void tst_QTemporaryDir::nonWritableCurrentDir()
     const QFileInfo nonWritableDirFi = QFileInfo(QLatin1String(nonWritableDir));
     QVERIFY(nonWritableDirFi.isDir());
 
-    if (EmulationDetector::isRunningArmOnX86()) {
-        if (nonWritableDirFi.ownerId() == ::geteuid()) {
-            QSKIP("Sysroot directories are owned by the current user");
-        }
-    }
-
     QVERIFY(!nonWritableDirFi.isWritable());
 
     ChdirOnReturn cor(QDir::currentPath());

diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt
@@ -20,10 +20,7 @@ list(APPEND test_data "../smb-file.txt")
 qt_internal_add_test(tst_qnetworkreply
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" # special case
     SOURCES
-        ../../../../../shared/emulationdetector.h
         ../tst_qnetworkreply.cpp
-    INCLUDE_DIRECTORIES
-        ../../../../../shared
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::NetworkPrivate

diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -103,8 +103,6 @@ Q_DECLARE_METATYPE(QAuthenticator*)
 Q_DECLARE_METATYPE(QNetworkProxyQuery)
 #endif
 
-#include "emulationdetector.h"
-
 typedef QSharedPointer<QNetworkReply> QNetworkReplyPtr;
 
 #ifndef QT_NO_OPENSSL
@@ -2127,14 +2125,6 @@ void tst_QNetworkReply::getErrors()
             QSKIP("Running this test as root doesn't make sense");
 
     }
-
-    if (EmulationDetector::isRunningArmOnX86()
-        && qstrcmp(QTest::currentDataTag(), "file-permissions") == 0) {
-        QFileInfo filePermissionFile = QFileInfo(filePermissionFileName.toLatin1());
-        if (filePermissionFile.ownerId() == ::geteuid()) {
-            QSKIP("Sysroot directories are owned by the current user");
-        }
-    }
 #endif
 
     QNetworkReplyPtr reply(manager.get(request));