summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2021-01-19 10:23:34 +0200
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2021-01-19 13:17:55 +0000
commit0392dce4f0a2093987ab45c48f0748c3dd97e7fc (patch)
tree6dbfb2dab7d2d7de9521d9b866589503ac16ab91
parent43d379797af833ee758dede2cd87b6f6b36770c0 (diff)
Android: skip tst_QFile::moveToTrash()
Android doesn't have a trash bin, so this test is not valid for that platform. Pick-to: 6.0 Fixes: QTBUG-89398 Change-Id: I119b25682ba18e18466b5687cae369445dc73311 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--tests/auto/corelib/io/qfile/BLACKLIST3
-rw-r--r--tests/auto/corelib/io/qfile/tst_qfile.cpp3
2 files changed, 3 insertions, 3 deletions
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 b1e0bab405..2019afaf66 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -3715,6 +3715,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);