From 6a35538d3da8c9c75b4c8aa71a3e1eef12983a69 Mon Sep 17 00:00:00 2001 From: Krzysztof Sommerfeld Date: Tue, 19 Dec 2023 03:16:06 +0100 Subject: [PATCH] Exclude VxWorks from trash bin tests 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 (cherry picked from commit 9735b105588d74c47d4195d367bcac89d3472643) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/corelib/io/qfile/tst_qfile.cpp | 9 ++++++--- .../corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index 2f178a7f23a..a5694896529 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -3994,7 +3994,7 @@ void tst_QFile::moveToTrash_data() 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"); #endif QFETCH(QString, source); @@ -4096,7 +4096,7 @@ void tst_QFile::moveToTrash() 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"); #endif QString origFileName = []() { @@ -4151,7 +4151,7 @@ void tst_QFile::moveToTrashOpenFile_data() 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"); #endif QFETCH(bool, useStatic); @@ -4211,6 +4211,9 @@ void tst_QFile::moveToTrashOpenFile() 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) QSKIP("This test is specific to XDG Unix systems"); #else diff --git a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp index 3d25027503e..fad1f3d4114 100644 --- a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp +++ b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp @@ -630,7 +630,7 @@ void tst_QTemporaryFile::renameFdLeak() 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"); #endif #ifdef Q_OS_WIN