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/widgets | |
| 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/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/.prev_CMakeLists.txt | 57 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/widgets.pro | 5 |
3 files changed, 66 insertions, 2 deletions
diff --git a/tests/auto/widgets/widgets/.prev_CMakeLists.txt b/tests/auto/widgets/widgets/.prev_CMakeLists.txt new file mode 100644 index 0000000000..64d7c934cc --- /dev/null +++ b/tests/auto/widgets/widgets/.prev_CMakeLists.txt @@ -0,0 +1,57 @@ +# Generated from widgets.pro. + +add_subdirectory(qabstractbutton) +add_subdirectory(qabstractscrollarea) +add_subdirectory(qabstractslider) +add_subdirectory(qbuttongroup) +add_subdirectory(qcalendarwidget) +add_subdirectory(qcheckbox) +add_subdirectory(qcommandlinkbutton) +add_subdirectory(qdatetimeedit) +add_subdirectory(qdial) +add_subdirectory(qdialogbuttonbox) +add_subdirectory(qdockwidget) +add_subdirectory(qdoublespinbox) +add_subdirectory(qfocusframe) +add_subdirectory(qfontcombobox) +add_subdirectory(qframe) +add_subdirectory(qgroupbox) +add_subdirectory(qlabel) +add_subdirectory(qlcdnumber) +add_subdirectory(qmdisubwindow) +add_subdirectory(qplaintextedit) +add_subdirectory(qprogressbar) +add_subdirectory(qpushbutton) +add_subdirectory(qradiobutton) +add_subdirectory(qscrollarea) +add_subdirectory(qscrollbar) +add_subdirectory(qsizegrip) +add_subdirectory(qslider) +add_subdirectory(qspinbox) +add_subdirectory(qsplitter) +add_subdirectory(qstackedwidget) +add_subdirectory(qstatusbar) +add_subdirectory(qtabbar) +add_subdirectory(qtabwidget) +add_subdirectory(qtextbrowser) +add_subdirectory(qtoolbox) +add_subdirectory(qtoolbutton) +if(QT_FEATURE_private_tests) + add_subdirectory(qabstractspinbox) + add_subdirectory(qcombobox) + add_subdirectory(qmainwindow) + add_subdirectory(qtextedit) + add_subdirectory(qtoolbar) +endif() +if(QT_FEATURE_shortcut) + add_subdirectory(qkeysequenceedit) +endif() +if(NOT ANDROID) + add_subdirectory(qlineedit) + add_subdirectory(qmdiarea) + add_subdirectory(qmenu) + add_subdirectory(qmenubar) +endif() +if(QT_FEATURE_opengl AND NOT ANDROID) + add_subdirectory(qopenglwidget) +endif() diff --git a/tests/auto/widgets/widgets/CMakeLists.txt b/tests/auto/widgets/widgets/CMakeLists.txt index e0c71f5c20..c64b86b3de 100644 --- a/tests/auto/widgets/widgets/CMakeLists.txt +++ b/tests/auto/widgets/widgets/CMakeLists.txt @@ -19,7 +19,6 @@ add_subdirectory(qgroupbox) add_subdirectory(qlabel) add_subdirectory(qlcdnumber) add_subdirectory(qmdisubwindow) -add_subdirectory(qmenu) add_subdirectory(qplaintextedit) add_subdirectory(qprogressbar) add_subdirectory(qpushbutton) @@ -52,9 +51,12 @@ if(NOT ANDROID) add_subdirectory(qlineedit) # QTBUG-87420 # special case add_subdirectory(qmdiarea) + # QTBUG-87671 # special case + add_subdirectory(qmenu) # QTBUG-87421 # special case add_subdirectory(qmenubar) endif() -if(QT_FEATURE_opengl) +# QTBUG-87671 # special case +if(QT_FEATURE_opengl AND NOT ANDROID) add_subdirectory(qopenglwidget) endif() diff --git a/tests/auto/widgets/widgets/widgets.pro b/tests/auto/widgets/widgets/widgets.pro index 3474d7174e..9019ed65b1 100644 --- a/tests/auto/widgets/widgets/widgets.pro +++ b/tests/auto/widgets/widgets/widgets.pro @@ -52,6 +52,8 @@ android: SUBDIRS -= \ qlineedit \ # QTBUG-87420 qmdiarea \ + # QTBUG-87671 + qmenu \ # QTBUG-87421 qmenubar @@ -67,3 +69,6 @@ android: SUBDIRS -= \ qtoolbar \ qtConfig(opengl): SUBDIRS += qopenglwidget + +# QTBUG-87671 +android: SUBDIRS -= qopenglwidget |