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

Exclude VxWorks from trash bin tests

Browse Source 
The XDG trash bin code in 6.7 onwards doesn't compile because VxWorks is missing the POSIX at-file system calls and we're working with WRS to find out more. Currently there is ongoing request to add this and more POSIX system calls.

Task-number: QTBUG-115777
Change-Id: I83fd2ab7130362c06c694195e7b33b6ba8011101
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 9735b105588d74c47d4195d367bcac89d3472643)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Krzysztof Sommerfeld 2023-12-19 03:16:06 +01:00 committed by Qt Cherry-pick Bot
parent 1c92de3944
commit 6a35538d3d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/corelib/io/qfile/tst_qfile.cpp
View File

@ -3994,7 +3994,7 @@ void tst_QFile::moveToTrash_data()
void tst_QFile::moveToTrash() void tst_QFile::moveToTrash()
{ {
#if defined(Q_OS_ANDROID) or defined(Q_OS_WEBOS) #if defined(Q_OS_ANDROID) or defined(Q_OS_WEBOS) or defined(Q_OS_VXWORKS)
QSKIP("This platform doesn't implement a trash bin"); QSKIP("This platform doesn't implement a trash bin");
#endif #endif
QFETCH(QString, source); QFETCH(QString, source);
@ -4096,7 +4096,7 @@ void tst_QFile::moveToTrash()
void tst_QFile::moveToTrashDuplicateName() void tst_QFile::moveToTrashDuplicateName()
{ {
#if defined(Q_OS_ANDROID) || defined(Q_OS_WEBOS) #if defined(Q_OS_ANDROID) || defined(Q_OS_WEBOS) || defined(Q_OS_VXWORKS)
QSKIP("This platform doesn't implement a trash bin"); QSKIP("This platform doesn't implement a trash bin");
#endif #endif
QString origFileName = []() { QString origFileName = []() {
@ -4151,7 +4151,7 @@ void tst_QFile::moveToTrashOpenFile_data()
void tst_QFile::moveToTrashOpenFile() void tst_QFile::moveToTrashOpenFile()
{ {
#if defined(Q_OS_ANDROID) || defined(Q_OS_WEBOS) #if defined(Q_OS_ANDROID) || defined(Q_OS_WEBOS) || defined(Q_OS_VXWORKS)
QSKIP("This platform doesn't implement a trash bin"); QSKIP("This platform doesn't implement a trash bin");
#endif #endif
QFETCH(bool, useStatic); QFETCH(bool, useStatic);
@ -4211,6 +4211,9 @@ void tst_QFile::moveToTrashOpenFile()
void tst_QFile::moveToTrashXdgSafety() void tst_QFile::moveToTrashXdgSafety()
{ {
#if defined(Q_OS_VXWORKS)
QSKIP("This platform doesn't implement a trash bin");
#endif
#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) || defined(Q_OS_ANDROID) || defined(Q_OS_WEBOS) #if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) || defined(Q_OS_ANDROID) || defined(Q_OS_WEBOS)
QSKIP("This test is specific to XDG Unix systems"); QSKIP("This test is specific to XDG Unix systems");
#else #else

2
tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
View File

@ -630,7 +630,7 @@ void tst_QTemporaryFile::renameFdLeak()
void tst_QTemporaryFile::moveToTrash() void tst_QTemporaryFile::moveToTrash()
{ {
#if defined(Q_OS_ANDROID) || defined(Q_OS_WEBOS) #if defined(Q_OS_ANDROID) || defined(Q_OS_WEBOS) || defined(Q_OS_VXWORKS)
QSKIP("This platform doesn't implement a trash bin"); QSKIP("This platform doesn't implement a trash bin");
#endif #endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN