From 9e006d6a3c39482ae2d97d115a259b038e845916 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 19 Jan 2021 10:23:34 +0200 Subject: Android: skip tst_QFile::moveToTrash() Android doesn't have a trash bin, so this test is not valid for that platform. Fixes: QTBUG-89398 Change-Id: I119b25682ba18e18466b5687cae369445dc73311 Reviewed-by: Volker Hilsheimer (cherry picked from commit 0392dce4f0a2093987ab45c48f0748c3dd97e7fc) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/corelib/io/qfile/BLACKLIST | 3 --- tests/auto/corelib/io/qfile/tst_qfile.cpp | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 tests/auto/corelib/io/qfile/BLACKLIST (limited to 'tests') diff --git a/tests/auto/corelib/io/qfile/BLACKLIST b/tests/auto/corelib/io/qfile/BLACKLIST deleted file mode 100644 index 19f1cccf9e..0000000000 --- a/tests/auto/corelib/io/qfile/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -# QTBUG-89398 -[moveToTrash] -android diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index e408cd3e48..0aa38bca31 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -3701,6 +3701,9 @@ void tst_QFile::moveToTrash_data() void tst_QFile::moveToTrash() { +#ifdef Q_OS_ANDROID + QSKIP("Android doesn't implement a trash bin"); +#endif QFETCH(QString, source); QFETCH(bool, create); QFETCH(bool, result); -- cgit v1.2.3