diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-04-11 17:18:09 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-04-24 10:42:10 +0200 |
| commit | 197f0ca6b418a27412bfcc7e891ab80949fd8833 (patch) | |
| tree | bb7dd2400bfc002dc5794466d3a74d39a80f8b00 /test/map | |
| parent | eed7dedf030ed71aac6d004becef42dbec5606bf (diff) | |
| download | qtlocation-mapboxgl-197f0ca6b418a27412bfcc7e891ab80949fd8833.tar.gz | |
[android] use AAssetManager instead of libzip
Diffstat (limited to 'test/map')
| -rw-r--r-- | test/map/map.test.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index f563aaa548..2f3883fb1f 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -356,12 +356,7 @@ TEST(Map, WithoutVAOExtension) { test.backend.getContext().disableVAOExtension = true; -#ifdef MBGL_ASSET_ZIP - // Regenerate with `cd test/fixtures/api/ && zip -r assets.zip assets/` - DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets.zip"); -#else DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets"); -#endif Map map(test.backend, test.view.getSize(), 1, fileSource, test.threadPool, MapMode::Still); map.setStyleJSON(util::read_file("test/fixtures/api/water.json")); @@ -589,14 +584,7 @@ TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) { BackendScope scope { backend }; OffscreenView view { backend.getContext() }; ThreadPool threadPool { 4 }; - -#ifdef MBGL_ASSET_ZIP - // Regenerate with `cd test/fixtures/api/ && zip -r assets.zip assets/` - DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets.zip"); -#else DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets"); -#endif - Map map(backend, view.getSize(), 1, fileSource, threadPool, MapMode::Continuous); using namespace std::chrono_literals; |