1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: Enable qstandardpaths test

Browse Source 
Also log if the entries does not exist in the filesystem

Change-Id: Id7d4dec1610af13869e645cf96b5bf6a1e26b956
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Even Oscar Andersen 2024-02-21 10:42:24 +01:00
parent 7b738ffc58
commit a99285c977
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/CMakeLists.txt
View File

@ -66,6 +66,7 @@ if(QT_BUILD_WASM_BATCHED_TESTS)
add_subdirectory(corelib/io/qbuffer) add_subdirectory(corelib/io/qbuffer)
add_subdirectory(corelib/io/qabstractfileengine) add_subdirectory(corelib/io/qabstractfileengine)
add_subdirectory(corelib/io/qsettings) add_subdirectory(corelib/io/qsettings)
add_subdirectory(corelib/io/qstandardpaths)
add_subdirectory(corelib/io/qfileselector) add_subdirectory(corelib/io/qfileselector)
add_subdirectory(corelib/io/qfile) add_subdirectory(corelib/io/qfile)
add_subdirectory(corelib/serialization) add_subdirectory(corelib/serialization)

8
tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
View File

@ -430,7 +430,7 @@ void tst_qstandardpaths::testAppConfigLocation()
#endif #endif
} }
#ifndef Q_OS_WIN #if !defined(Q_OS_WIN) && !defined(Q_OS_WASM)
// Find "sh" on Unix. // Find "sh" on Unix.
// It may exist twice, in /bin/sh and /usr/bin/sh, in that case use the PATH order. // It may exist twice, in /bin/sh and /usr/bin/sh, in that case use the PATH order.
static inline QFileInfo findSh() static inline QFileInfo findSh()
@ -484,6 +484,7 @@ void tst_qstandardpaths::testFindExecutable_data()
<< QString() << logo << logoPath; << QString() << logo << logoPath;
} }
#else #else
# ifndef Q_OS_WASM
const QFileInfo shFi = findSh(); const QFileInfo shFi = findSh();
Q_ASSERT(shFi.exists()); Q_ASSERT(shFi.exists());
const QString shPath = shFi.absoluteFilePath(); const QString shPath = shFi.absoluteFilePath();
@ -493,6 +494,7 @@ void tst_qstandardpaths::testFindExecutable_data()
<< QString() << shPath << shPath; << QString() << shPath << shPath;
QTest::newRow("unix-sh-relativepath") QTest::newRow("unix-sh-relativepath")
<< QString(shFi.absolutePath()) << QString::fromLatin1("./sh") << shPath; << QString(shFi.absolutePath()) << QString::fromLatin1("./sh") << shPath;
#endif /* !WASM */
#endif #endif
QTest::newRow("idontexist") QTest::newRow("idontexist")
<< QString() << QString::fromLatin1("idontexist") << QString(); << QString() << QString::fromLatin1("idontexist") << QString();
@ -524,6 +526,9 @@ void tst_qstandardpaths::testFindExecutable()
void tst_qstandardpaths::testFindExecutableLinkToDirectory() void tst_qstandardpaths::testFindExecutableLinkToDirectory()
{ {
#ifdef Q_OS_WASM
QSKIP("No applicationdir on wasm");
#else
// link to directory // link to directory
const QString target = QDir::tempPath() + QDir::separator() + QLatin1String("link.lnk"); const QString target = QDir::tempPath() + QDir::separator() + QLatin1String("link.lnk");
QFile::remove(target); QFile::remove(target);
@ -531,6 +536,7 @@ void tst_qstandardpaths::testFindExecutableLinkToDirectory()
QVERIFY(appFile.link(target)); QVERIFY(appFile.link(target));
QVERIFY(QStandardPaths::findExecutable(target).isEmpty()); QVERIFY(QStandardPaths::findExecutable(target).isEmpty());
QFile::remove(target); QFile::remove(target);
#endif
} }
using RuntimeDirSetup = std::optional<QString> (*)(QDir &); using RuntimeDirSetup = std::optional<QString> (*)(QDir &);