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/api | |
parent | 815ffb253b555c9a99b7d63a343745db05802c76 (diff) | |
download | qtlocation-mapboxgl-a5a0558bde5d67617b6f305179063cd4e0ac329e.tar.gz |
[test] allow only a single shared display to avoid egl errors
Diffstat (limited to 'test/api')
-rw-r--r-- | test/api/annotations.test.cpp | 2 | ||||
-rw-r--r-- | test/api/api_misuse.test.cpp | 2 | ||||
-rw-r--r-- | test/api/custom_layer.test.cpp | 2 | ||||
-rw-r--r-- | test/api/query.test.cpp | 2 | ||||
-rw-r--r-- | test/api/render_missing.test.cpp | 2 | ||||
-rw-r--r-- | test/api/repeated_render.test.cpp | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/test/api/annotations.test.cpp b/test/api/annotations.test.cpp index bc1ad54129..878ef90831 100644 --- a/test/api/annotations.test.cpp +++ b/test/api/annotations.test.cpp @@ -30,7 +30,7 @@ std::unique_ptr<style::Image> namedMarker(const std::string& name) { class AnnotationTest { public: util::RunLoop loop; - HeadlessBackend backend { test::sharedDisplay() }; + HeadlessBackend backend; BackendScope scope { backend }; OffscreenView view { backend.getContext() }; StubFileSource fileSource; diff --git a/test/api/api_misuse.test.cpp b/test/api/api_misuse.test.cpp index ed5cc41a49..9f53b763be 100644 --- a/test/api/api_misuse.test.cpp +++ b/test/api/api_misuse.test.cpp @@ -24,7 +24,7 @@ TEST(API, RenderWithoutCallback) { util::RunLoop loop; - HeadlessBackend backend { test::sharedDisplay() }; + HeadlessBackend backend; BackendScope scope { backend }; OffscreenView view { backend.getContext(), { 128, 512 } }; StubFileSource fileSource; diff --git a/test/api/custom_layer.test.cpp b/test/api/custom_layer.test.cpp index da5b535a86..972485338f 100644 --- a/test/api/custom_layer.test.cpp +++ b/test/api/custom_layer.test.cpp @@ -89,7 +89,7 @@ public: TEST(CustomLayer, Basic) { util::RunLoop loop; - HeadlessBackend backend { test::sharedDisplay() }; + HeadlessBackend backend; BackendScope scope { backend }; OffscreenView view { backend.getContext() }; DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets"); diff --git a/test/api/query.test.cpp b/test/api/query.test.cpp index 5135b51e8b..a5224222cb 100644 --- a/test/api/query.test.cpp +++ b/test/api/query.test.cpp @@ -30,7 +30,7 @@ public: } util::RunLoop loop; - HeadlessBackend backend { test::sharedDisplay() }; + HeadlessBackend backend; BackendScope scope { backend }; OffscreenView view { backend.getContext() }; StubFileSource fileSource; diff --git a/test/api/render_missing.test.cpp b/test/api/render_missing.test.cpp index 01a0e9293b..02c19d359b 100644 --- a/test/api/render_missing.test.cpp +++ b/test/api/render_missing.test.cpp @@ -30,7 +30,7 @@ TEST(API, TEST_REQUIRES_SERVER(RenderMissingTile)) { const auto style = util::read_file("test/fixtures/api/water_missing_tiles.json"); - HeadlessBackend backend { test::sharedDisplay() }; + HeadlessBackend backend; BackendScope scope { backend }; OffscreenView view { backend.getContext(), { 256, 512 } }; float pixelRatio { 1 }; diff --git a/test/api/repeated_render.test.cpp b/test/api/repeated_render.test.cpp index 7d61992769..0e8a2715b7 100644 --- a/test/api/repeated_render.test.cpp +++ b/test/api/repeated_render.test.cpp @@ -27,7 +27,7 @@ TEST(API, RepeatedRender) { const auto style = util::read_file("test/fixtures/api/water.json"); - HeadlessBackend backend { test::sharedDisplay() }; + HeadlessBackend backend; BackendScope scope { backend }; OffscreenView view { backend.getContext(), { 512, 512 } }; float pixelRatio { 1 }; @@ -84,7 +84,7 @@ TEST(API, ZoomHistory) { const auto style = util::read_file("test/fixtures/api/empty.json"); - HeadlessBackend backend { test::sharedDisplay() }; + HeadlessBackend backend; BackendScope scope { backend }; OffscreenView view { backend.getContext(), { 512, 512 } }; DefaultFileSource fileSource(":memory:", "."); |