From 76f866c40aa536ed81ef6659690032b1c02f3b4c Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Sat, 14 Nov 2020 23:43:36 +0200 Subject: [PATCH] Android: move blocked tests of qapplication to test folder Android packages the test instead of qapplication folder, thus the BLACKLIST file for Android tests needs to be in "test" folder instead. Task-number: QTBUG-87666 Task-number: QTBUG-87025 Change-Id: I065072fa8a030cf9d15e057869e74a8c736c80ab Reviewed-by: Alexandru Croitor --- .../widgets/kernel/qapplication/BLACKLIST | 17 --------------- .../kernel/qapplication/test/BLACKLIST | 21 +++++++++++++++++++ 2 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 tests/auto/widgets/kernel/qapplication/test/BLACKLIST diff --git a/tests/auto/widgets/kernel/qapplication/BLACKLIST b/tests/auto/widgets/kernel/qapplication/BLACKLIST index aa3438975c..cce10602e4 100644 --- a/tests/auto/widgets/kernel/qapplication/BLACKLIST +++ b/tests/auto/widgets/kernel/qapplication/BLACKLIST @@ -3,20 +3,3 @@ ubuntu-20.04 [touchEventPropagation] # QTBUG-66745 opensuse-leap -# QTBUG-87666 -[setFont] -android -[closeAllWindows] -android -[libraryPaths_qt_plugin_path_2] -android -[desktopSettingsAware] -android -[applicationPalettePolish] -android -[touchEventPropagation] -android -[wheelEventPropagation] -android -[qtbug_12673] -android diff --git a/tests/auto/widgets/kernel/qapplication/test/BLACKLIST b/tests/auto/widgets/kernel/qapplication/test/BLACKLIST new file mode 100644 index 0000000000..2cc96e857d --- /dev/null +++ b/tests/auto/widgets/kernel/qapplication/test/BLACKLIST @@ -0,0 +1,21 @@ +# This file is mainly used for Android tests since Android +# packages "test" instead of "qapplication" folder +# QTBUG-87025 +[libraryPaths] +android +[setFont] +android +[closeAllWindows] +android +[libraryPaths_qt_plugin_path_2] +android +[desktopSettingsAware] +android +[applicationPalettePolish] +android +[touchEventPropagation] +android +[wheelEventPropagation] +android +[qtbug_12673] +android