Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
[android] #5456 - Excluded tests on android that don't run with filte…
Browse files Browse the repository at this point in the history
…rs instead of commenting out
  • Loading branch information
ivovandongen committed Jun 29, 2016
1 parent ad0f800 commit 7001585
Showing 1 changed file with 82 additions and 0 deletions.
82 changes: 82 additions & 0 deletions test/test.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,74 @@
],

'sources': [
'util/async_task.cpp',
'util/geo.cpp',
'util/image.cpp',
'util/mapbox.cpp',
'util/memory.cpp',
'util/merge_lines.cpp',
'util/run_loop.cpp',
'util/number_conversions.cpp',
'util/text_conversions.cpp',
'util/thread.cpp',
'util/thread_local.cpp',
'util/tile_cover.cpp',
'util/timer.cpp',
'util/token.cpp',
'util/work_queue.cpp',
'util/projection.cpp',

'algorithm/covered_by_children.cpp',
'algorithm/generate_clip_ids.cpp',
'algorithm/mock.hpp',
'algorithm/update_renderables.cpp',

'api/annotations.cpp',
'api/api_misuse.cpp',
'api/repeated_render.cpp',
'api/render_missing.cpp',
'api/set_style.cpp',
'api/custom_layer.cpp',

'geometry/binpack.cpp',

'gl/object.cpp',

'map/map.cpp',
'map/transform.cpp',

'math/minmax.cpp',
'math/clamp.cpp',

'text/quads.cpp',

'tile/geometry_tile_data.cpp',
'tile/tile_id.cpp',

'storage/offline.cpp',
'storage/offline_database.cpp',
'storage/offline_download.cpp',
'storage/asset_file_source.cpp',
'storage/default_file_source.cpp',
'storage/http_file_source.cpp',
'storage/online_file_source.cpp',
'storage/headers.cpp',
'storage/resource.cpp',

'style/glyph_store.cpp',
'style/source.cpp',
'style/style.cpp',
'style/style_layer.cpp',
'style/tile_source.cpp',
'style/filter.cpp',
'style/functions.cpp',
'style/style_parser.cpp',

'sprite/sprite_atlas.cpp',
'sprite/sprite_image.cpp',
'sprite/sprite_parser.cpp',
'sprite/sprite_store.cpp',

'src/mbgl/test/stub_file_source.hpp',
'src/mbgl/test/stub_file_source.cpp',
'src/mbgl/test/util.hpp',
Expand Down Expand Up @@ -63,7 +126,26 @@
}, {
'cflags_cc': [ '<@(cflags_cc)' ],
}],

#Exclude tests that don't run on android yet
['target_platform == "android"', {
'sources!': ['util/async_task.cpp'], # Doesn't compile??
'sources/': [
['exclude', 'util/.*(hpp|cpp)$'],
['exclude', 'api/.*(hpp|cpp)$'],
['exclude', '^geometry/.*(hpp|cpp)$'],
['exclude', 'gl/object.cpp'],
['exclude', 'map/.*(hpp|cpp)$'],
['exclude', 'math/.*(hpp|cpp)$'],
['exclude', 'text/.*(hpp|cpp)$'],
['exclude', 'tile/.*(hpp|cpp)$'],
['exclude', 'storage/.*(hpp|cpp)$'],
['exclude', 'style/.*(hpp|cpp)$'],
['exclude', 'sprite/.*(hpp|cpp)$'],
]
}]
],

'link_settings': {
'conditions': [
['OS == "mac"', {
Expand Down

0 comments on commit 7001585

Please sign in to comment.