diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-01-26 12:25:19 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2021-01-28 09:27:06 +0200 |
| commit | d5a20467b81b3412f9a230dbdc23f805ea86c213 (patch) | |
| tree | c33ea7218dac0b0291464500bf05501c77e033d4 /tests/auto | |
| parent | dac4d5a4927316303c2a70039728d57f4309de90 (diff) | |
tests: remove unnecessary skips for qemu
QEMU sysroots are now root owned.
Change-Id: Id829cb5debc449efee929ef83876e6ffbf78332c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'tests/auto')
4 files changed, 0 insertions, 23 deletions
diff --git a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt index 58eb49dff8..fa8efa114b 100644 --- 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 index 4f4bedd933..4969c0e6e3 100644 --- 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 index e60d254651..d1b664e2d6 100644 --- 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 index 45fb7778e9..5e8a5420e1 100644 --- 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)); |