diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-10-13 14:36:18 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-04 12:27:49 +0200 |
| commit | 039d3fe4e884c3680cb21d89deba7857dde1269c (patch) | |
| tree | 6dac25efb404be03393fa77179086d4850eaee5b /tests/auto/corelib/plugin | |
| parent | a7b6f0391b437e4b1a1d834421edfa78ff2ec14c (diff) | |
Android: blacklist a list of failing tests for android
We want to re-enable Android tests in QTQAINFRA-3867. However,
many tests are failing already preventing that from happening.
QTBUG-87025 is currently keeping track (links) to all of those
failing tests.
The current proposal is to hide those failing tests, and enable
Android test running in COIN for other tests. After, that try
to fix them one by one, and at the same time we can make sure
no more failing tests go unnoticed.
Task-number: QTBUG-87025
Change-Id: Ic1fe9fdd167cbcfd99efce9a09c69c344a36bbe4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/corelib/plugin')
| -rw-r--r-- | tests/auto/corelib/plugin/.prev_CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/corelib/plugin/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tests/auto/corelib/plugin/plugin.pro | 9 |
3 files changed, 18 insertions, 6 deletions
diff --git a/tests/auto/corelib/plugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/.prev_CMakeLists.txt index 710d471e8a..9abd791c92 100644 --- a/tests/auto/corelib/plugin/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/.prev_CMakeLists.txt @@ -1,13 +1,13 @@ # Generated from plugin.pro. -if(QT_BUILD_SHARED_LIBS) +if(QT_BUILD_SHARED_LIBS AND NOT ANDROID) add_subdirectory(qfactoryloader) endif() add_subdirectory(quuid) -if(QT_FEATURE_library) +if(QT_FEATURE_library AND NOT ANDROID) add_subdirectory(qpluginloader) add_subdirectory(qlibrary) endif() -if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library) +if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library AND NOT ANDROID) add_subdirectory(qplugin) endif() diff --git a/tests/auto/corelib/plugin/CMakeLists.txt b/tests/auto/corelib/plugin/CMakeLists.txt index 13a97ed349..e0ac398144 100644 --- a/tests/auto/corelib/plugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/CMakeLists.txt @@ -1,14 +1,17 @@ # Generated from plugin.pro. -if(QT_BUILD_SHARED_LIBS) +# QTBUG-87438 # special case +if(QT_BUILD_SHARED_LIBS AND NOT ANDROID) add_subdirectory(qfactoryloader) endif() add_subdirectory(quuid) -if(QT_FEATURE_library) +# QTBUG-87438 # special case +if(QT_FEATURE_library AND NOT ANDROID) add_subdirectory(qpluginloader) add_subdirectory(qlibrary) endif() -if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library) +# QTBUG-87438 # special case +if(QT_BUILD_SHARED_LIBS AND QT_FEATURE_library AND NOT ANDROID) # special case begin # QTBUG-85364 if(NOT LINUX) diff --git a/tests/auto/corelib/plugin/plugin.pro b/tests/auto/corelib/plugin/plugin.pro index 240608fddf..c153fa37d9 100644 --- a/tests/auto/corelib/plugin/plugin.pro +++ b/tests/auto/corelib/plugin/plugin.pro @@ -13,3 +13,12 @@ contains(CONFIG, static) { SUBDIRS -= qfactoryloader \ qplugin } + +# QTBUG-87438 +android { + SUBDIRS -= \ + qpluginloader \ + qplugin \ + qlibrary \ + qfactoryloader +} |