summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2020-11-25 20:27:16 +0200
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2020-11-25 23:08:09 +0200
commit63934f13380c9ed3c455394e2ba863d44239f05c (patch)
treec347eb91f27c96ef59cd21733315c051912a8237
parent3f8896d77e80f652bf1b7d3a25eb0a6be3ba4473 (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 Pick-to: 6.0 Change-Id: I4fda7c2ddf8cd1e6858617e7bb447078c5768a75 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--tests/auto/testlib/.prev_CMakeLists.txt4
-rw-r--r--tests/auto/testlib/CMakeLists.txt5
-rw-r--r--tests/auto/testlib/testlib.pro4
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