diff options
| author | Artem Pavlenko <artem@mapnik.org> | 2020-02-14 16:56:46 +0000 |
|---|---|---|
| committer | Artem Pavlenko <artem@mapnik.org> | 2020-02-14 16:56:46 +0000 |
| commit | 145c053a02d918d74002ea690dac398ee588a374 (patch) | |
| tree | c645ffaec12822f0668858181248cd7365fc4e20 /test/include/mbgl/test/util.hpp | |
| parent | 37a4660ca367f141b9e0dedf3932c74f0ee0c920 (diff) | |
| parent | 59294aaef333bdd455bd13d6bab6fca730379b52 (diff) | |
| download | qtlocation-mapboxgl-upstream/galinelle_setStyle++_updated.tar.gz | |
Merge branch 'master' into galinelle_setStyle++_updatedupstream/galinelle_setStyle++_updated
Diffstat (limited to 'test/include/mbgl/test/util.hpp')
| -rw-r--r-- | test/include/mbgl/test/util.hpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/test/include/mbgl/test/util.hpp b/test/include/mbgl/test/util.hpp index 959b3e646f..a8b1d1b2c6 100644 --- a/test/include/mbgl/test/util.hpp +++ b/test/include/mbgl/test/util.hpp @@ -4,17 +4,12 @@ #include <TargetConditionals.h> #endif -#if ANDROID - #define TEST_READ_ONLY 0 -#elif TARGET_OS_IOS - #define TEST_READ_ONLY 1 - #undef TEST_HAS_SERVER - #define TEST_HAS_SERVER 0 -#else - #define TEST_READ_ONLY 0 - #ifndef TEST_HAS_SERVER - #define TEST_HAS_SERVER 1 - #endif +#define TEST_READ_ONLY 0 + +#if !ANDROID +#ifndef TEST_HAS_SERVER +#define TEST_HAS_SERVER 1 +#endif #endif #if TARGET_OS_SIMULATOR |