diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-25 20:27:16 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-26 00:01:13 +0000 |
| commit | e6a37561e371ee98082c493d6451cda0e09d3b24 (patch) | |
| tree | e54c96522183286af18ab24e6cfc3424db4ba13c /tests/auto/testlib | |
| parent | f86986f61b04e5a3bfc65b734d532c87b7a82631 (diff) | |
Android: exclude faulty tst_selftests
This test was failing but was returning a pass because of a bug
in androidtestrunner.
Task-number: QTBUG-88507
Task-number: QTBUG-88508
Change-Id: I4fda7c2ddf8cd1e6858617e7bb447078c5768a75
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 63934f13380c9ed3c455394e2ba863d44239f05c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto/testlib')
| -rw-r--r-- | tests/auto/testlib/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/testlib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/testlib/testlib.pro | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/tests/auto/testlib/.prev_CMakeLists.txt b/tests/auto/testlib/.prev_CMakeLists.txt index 2b5c95417f..2e3a2407f5 100644 --- a/tests/auto/testlib/.prev_CMakeLists.txt +++ b/tests/auto/testlib/.prev_CMakeLists.txt @@ -3,7 +3,9 @@ add_subdirectory(initmain) add_subdirectory(outformat) add_subdirectory(qsignalspy) -add_subdirectory(selftests) +if(NOT ANDROID) + add_subdirectory(selftests) +endif() if(TARGET Qt::Widgets) add_subdirectory(qabstractitemmodeltester) endif() diff --git a/tests/auto/testlib/CMakeLists.txt b/tests/auto/testlib/CMakeLists.txt index 76790e2ee3..ad895108e7 100644 --- a/tests/auto/testlib/CMakeLists.txt +++ b/tests/auto/testlib/CMakeLists.txt @@ -3,7 +3,10 @@ # add_subdirectory(initmain) # special case missing project # add_subdirectory(outformat) # special case missing project add_subdirectory(qsignalspy) -add_subdirectory(selftests) +# QTBUG-88507 # special case +if(NOT ANDROID) + add_subdirectory(selftests) +endif() if(TARGET Qt::Widgets) add_subdirectory(qabstractitemmodeltester) endif() diff --git a/tests/auto/testlib/testlib.pro b/tests/auto/testlib/testlib.pro index 55f1f9b87b..1e4b1baa50 100644 --- a/tests/auto/testlib/testlib.pro +++ b/tests/auto/testlib/testlib.pro @@ -5,4 +5,8 @@ SUBDIRS = \ qsignalspy \ selftests \ +# QTBUG-88507 +android: SUBDIRS -= \ + selftests + qtHaveModule(widgets): SUBDIRS += qabstractitemmodeltester |