summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2019-05-08 12:06:05 +0200
committerPaolo Angelelli <paolo.angelelli@qt.io>2019-05-08 15:19:42 +0000
commit0e64148b39ab7e7417d9d115ddc53631167989b1 (patch)
tree938884b694ad3c055f30cf5ea21a99bd7bfd840d
parent4d3183c6ca22203a75e29af601b4c407231eaab4 (diff)
downloadqtlocation-0e64148b39ab7e7417d9d115ddc53631167989b1.tar.gz
Android: disable tests requiring plugins or local files
While we develop a long term solution to deal with this. Fixes: QTBUG-73575 Fixes: QTBUG-73576 Fixes: QTBUG-73578 Fixes: QTBUG-73579 Fixes: QTBUG-73580 Fixes: QTBUG-73581 Change-Id: Ib70d8f084dcbafa8853e0c687d0a31c88eef991f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--tests/auto/auto.pro41
1 files changed, 23 insertions, 18 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 1229874a..35e0627a 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -23,16 +23,17 @@ qtHaveModule(location) {
qplacesearchresult \
qplacesearchreply \
qplacesearchsuggestionreply \
- qplaceuser \
+ qplaceuser
+
+ !android: SUBDIRS += \
qplacemanager \
qplacemanager_nokia \
qplacemanager_unsupported \
placesplugin_unsupported
#misc tests
- SUBDIRS += qmlinterface \
- cmake \
- doublevectors
+ SUBDIRS += doublevectors
+ !android: SUBDIRS += cmake qmlinterface # looks for .qmls locally
#Map and Navigation tests
SUBDIRS += geotestplugin \
@@ -40,26 +41,28 @@ qtHaveModule(location) {
qgeocameracapabilities\
qgeocameradata \
qgeocodereply \
- qgeocodingmanager \
qgeomaneuver \
qgeotiledmapscene \
qgeoroute \
qgeoroutereply \
qgeorouterequest \
qgeoroutesegment \
- qgeoroutingmanager \
qgeoroutingmanagerplugins \
- qgeoserviceprovider \
- qgeotiledmap \
qgeotilespec \
qgeoroutexmlparser \
maptype \
- nokia_services \
qgeocameratiles
- qtHaveModule(quick) {
- SUBDIRS += declarative_core \
- declarative_geoshape
+ # These use plugins
+ !android: SUBDIRS += qgeoserviceprovider \
+ qgeoroutingmanager \
+ nokia_services \
+ qgeocodingmanager \
+ qgeotiledmap
+
+ qtHaveModule(quick):!android {
+ SUBDIRS += declarative_geoshape \
+ declarative_core
!mac: SUBDIRS += declarative_ui
}
@@ -67,10 +70,7 @@ qtHaveModule(location) {
SUBDIRS += \
- positionplugin \
- positionplugintest \
qgeoaddress \
- qgeoareamonitor \
qgeoshape \
qgeorectangle \
qgeocircle \
@@ -79,7 +79,12 @@ SUBDIRS += \
qgeocoordinate \
qgeolocation \
qgeopositioninfo \
- qgeopositioninfosource \
qgeosatelliteinfo \
- qgeosatelliteinfosource \
- qnmeapositioninfosource
+
+!android: SUBDIRS += \
+ positionplugin \
+ positionplugintest \
+ qgeoareamonitor \
+ qgeopositioninfosource \
+ qgeosatelliteinfosource \
+ qnmeapositioninfosource