diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-14 22:06:06 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-16 13:35:44 +0200 |
| commit | ac1cbc752f2d45e90dba0c212a3eb4ac603c793b (patch) | |
| tree | 689eb864fdc3f807cdc9378c4fbafc485939e4e6 /tests/auto/widgets/dialogs | |
| parent | c8ae8ddb3a7bd3e4d0cb968f2b39ceb0c150dcee (diff) | |
Android: exclude tests crashing at start
These tests are failing with "java.lang.UnsatisfiedLinkError: dlopen
failed: invalid ELF file" at the start, excluding them now to enable
Android testing until they're fixed later.
Task-number: QTBUG-87671
Task-number: QTBUG-87025
Change-Id: Ida7d7158fccdc31df1f9689f77fde832964d732f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/widgets/dialogs')
| -rw-r--r-- | tests/auto/widgets/dialogs/.prev_CMakeLists.txt | 17 | ||||
| -rw-r--r-- | tests/auto/widgets/dialogs/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/auto/widgets/dialogs/dialogs.pro | 5 |
3 files changed, 27 insertions, 2 deletions
diff --git a/tests/auto/widgets/dialogs/.prev_CMakeLists.txt b/tests/auto/widgets/dialogs/.prev_CMakeLists.txt new file mode 100644 index 0000000000..7bb279e271 --- /dev/null +++ b/tests/auto/widgets/dialogs/.prev_CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from dialogs.pro. + +add_subdirectory(qcolordialog) +add_subdirectory(qdialog) +add_subdirectory(qerrormessage) +add_subdirectory(qfiledialog2) +add_subdirectory(qfontdialog) +add_subdirectory(qinputdialog) +add_subdirectory(qprogressdialog) +add_subdirectory(qwizard) +if(NOT ANDROID) + add_subdirectory(qfiledialog) + add_subdirectory(qmessagebox) +endif() +if(QT_FEATURE_private_tests) + add_subdirectory(qsidebar) +endif() diff --git a/tests/auto/widgets/dialogs/CMakeLists.txt b/tests/auto/widgets/dialogs/CMakeLists.txt index 13c4e6cad8..c21c65dbe3 100644 --- a/tests/auto/widgets/dialogs/CMakeLists.txt +++ b/tests/auto/widgets/dialogs/CMakeLists.txt @@ -3,13 +3,16 @@ add_subdirectory(qcolordialog) add_subdirectory(qdialog) add_subdirectory(qerrormessage) -add_subdirectory(qfiledialog) add_subdirectory(qfiledialog2) add_subdirectory(qfontdialog) add_subdirectory(qinputdialog) -add_subdirectory(qmessagebox) add_subdirectory(qprogressdialog) add_subdirectory(qwizard) +# QTBUG-87671 # special case +if(NOT ANDROID) + add_subdirectory(qfiledialog) + add_subdirectory(qmessagebox) +endif() if(QT_FEATURE_private_tests) add_subdirectory(qsidebar) endif() diff --git a/tests/auto/widgets/dialogs/dialogs.pro b/tests/auto/widgets/dialogs/dialogs.pro index b4217a219d..6d6f6987f0 100644 --- a/tests/auto/widgets/dialogs/dialogs.pro +++ b/tests/auto/widgets/dialogs/dialogs.pro @@ -12,6 +12,11 @@ SUBDIRS=\ qsidebar \ qwizard \ +# QTBUG-87671 +android: SUBDIRS -= \ + qfiledialog \ + qmessagebox + !qtConfig(private_tests): SUBDIRS -= \ qsidebar \ |