diff options
author | Ivo van Dongen <info@ivovandongen.nl> | 2017-07-05 18:04:15 +0300 |
---|---|---|
committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2017-07-18 10:45:12 +0200 |
commit | a5a0558bde5d67617b6f305179063cd4e0ac329e (patch) | |
tree | 346e4a6831ff991c5e805b1ae0616839ac9c7b62 /test/map | |
parent | 815ffb253b555c9a99b7d63a343745db05802c76 (diff) | |
download | qtlocation-mapboxgl-a5a0558bde5d67617b6f305179063cd4e0ac329e.tar.gz |
[test] allow only a single shared display to avoid egl errors
Diffstat (limited to 'test/map')
-rw-r--r-- | test/map/map.test.cpp | 5 | ||||
-rw-r--r-- | test/map/prefetch.test.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index 93890aa9f3..3e8f8696e1 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -6,6 +6,7 @@ #include <mbgl/map/map.hpp> #include <mbgl/renderer/backend_scope.hpp> #include <mbgl/gl/headless_backend.hpp> +#include <mbgl/gl/headless_display.hpp> #include <mbgl/gl/offscreen_view.hpp> #include <mbgl/gl/context.hpp> #include <mbgl/util/default_thread_pool.hpp> @@ -539,8 +540,8 @@ TEST(Map, DontLoadUnneededTiles) { TEST(Map, TEST_DISABLED_ON_CI(ContinuousRendering)) { util::RunLoop runLoop; - HeadlessBackend backend { test::sharedDisplay() }; - BackendScope scope(backend); + HeadlessBackend backend; + BackendScope scope { backend }; OffscreenView view { backend.getContext() }; ThreadPool threadPool { 4 }; DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets"); diff --git a/test/map/prefetch.test.cpp b/test/map/prefetch.test.cpp index c3ff04acfc..436bdc3b63 100644 --- a/test/map/prefetch.test.cpp +++ b/test/map/prefetch.test.cpp @@ -24,7 +24,7 @@ using namespace std::literals::string_literals; TEST(Map, PrefetchTiles) { util::RunLoop runLoop; - HeadlessBackend backend(test::sharedDisplay()); + HeadlessBackend backend; BackendScope scope(backend); OffscreenView view(backend.getContext(), { 512, 512 }); ThreadPool threadPool(4); |