diff options
54 files changed, 91 insertions, 92 deletions
diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp index 8e21b615a1..ed95d29b10 100644 --- a/test/api/annotations.cpp +++ b/test/api/annotations.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/annotation/point_annotation.hpp> #include <mbgl/annotation/shape_annotation.hpp> diff --git a/test/api/api_misuse.cpp b/test/api/api_misuse.cpp index b1bfa5a59a..932c4717e8 100644 --- a/test/api/api_misuse.cpp +++ b/test/api/api_misuse.cpp @@ -1,5 +1,5 @@ -#include "../fixtures/util.hpp" -#include "../fixtures/fixture_log_observer.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_display.hpp> diff --git a/test/api/custom_layer.cpp b/test/api/custom_layer.cpp index ef98b05983..5346fee124 100644 --- a/test/api/custom_layer.cpp +++ b/test/api/custom_layer.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_display.hpp> diff --git a/test/api/offline.cpp b/test/api/offline.cpp index 9940432e3f..fbbd9f12f3 100644 --- a/test/api/offline.cpp +++ b/test/api/offline.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/platform/default/headless_display.hpp> #include <mbgl/platform/default/headless_view.hpp> diff --git a/test/api/render_missing.cpp b/test/api/render_missing.cpp index 5d63689d0a..74cc38432a 100644 --- a/test/api/render_missing.cpp +++ b/test/api/render_missing.cpp @@ -1,5 +1,5 @@ -#include "../fixtures/util.hpp" -#include "../fixtures/fixture_log_observer.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_view.hpp> diff --git a/test/api/repeated_render.cpp b/test/api/repeated_render.cpp index 788363f0d1..24aa87ca67 100644 --- a/test/api/repeated_render.cpp +++ b/test/api/repeated_render.cpp @@ -1,5 +1,5 @@ -#include "../fixtures/util.hpp" -#include "../fixtures/fixture_log_observer.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_view.hpp> diff --git a/test/api/set_style.cpp b/test/api/set_style.cpp index befbf62210..329ec2801d 100644 --- a/test/api/set_style.cpp +++ b/test/api/set_style.cpp @@ -1,5 +1,5 @@ -#include "../fixtures/util.hpp" -#include "../fixtures/fixture_log_observer.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_view.hpp> diff --git a/test/geometry/binpack.cpp b/test/geometry/binpack.cpp index 54f410a0be..0b74df7fa9 100644 --- a/test/geometry/binpack.cpp +++ b/test/geometry/binpack.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/geometry/binpack.hpp> diff --git a/test/fixtures/fixture_log_observer.hpp b/test/include/mbgl/test/fixture_log_observer.hpp index f2ccb5cb58..f2ccb5cb58 100644 --- a/test/fixtures/fixture_log_observer.hpp +++ b/test/include/mbgl/test/fixture_log_observer.hpp diff --git a/test/fixtures/mock_view.hpp b/test/include/mbgl/test/mock_view.hpp index e608545da5..e608545da5 100644 --- a/test/fixtures/mock_view.hpp +++ b/test/include/mbgl/test/mock_view.hpp diff --git a/test/fixtures/stub_file_source.hpp b/test/include/mbgl/test/stub_file_source.hpp index dbb584fdcc..dbb584fdcc 100644 --- a/test/fixtures/stub_file_source.hpp +++ b/test/include/mbgl/test/stub_file_source.hpp diff --git a/test/fixtures/stub_style_observer.hpp b/test/include/mbgl/test/stub_style_observer.hpp index 7236ca74f5..7236ca74f5 100644 --- a/test/fixtures/stub_style_observer.hpp +++ b/test/include/mbgl/test/stub_style_observer.hpp diff --git a/test/fixtures/util.hpp b/test/include/mbgl/test/util.hpp index 911f2073b5..911f2073b5 100644 --- a/test/fixtures/util.hpp +++ b/test/include/mbgl/test/util.hpp diff --git a/test/map/map.cpp b/test/map/map.cpp index 37caa95e97..68f7db3e7b 100644 --- a/test/map/map.cpp +++ b/test/map/map.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_view.hpp> diff --git a/test/map/map_context.cpp b/test/map/map_context.cpp index 2f3576a3b5..a1152d68e7 100644 --- a/test/map/map_context.cpp +++ b/test/map/map_context.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/map/map_data.hpp> #include <mbgl/map/map_context.hpp> diff --git a/test/map/tile.cpp b/test/map/tile.cpp index 8341725f0f..ad703595ad 100644 --- a/test/map/tile.cpp +++ b/test/map/tile.cpp @@ -1,5 +1,5 @@ #include <iostream> -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/map/tile_id.hpp> diff --git a/test/map/transform.cpp b/test/map/transform.cpp index 0567696f60..104ad7085f 100644 --- a/test/map/transform.cpp +++ b/test/map/transform.cpp @@ -1,5 +1,5 @@ -#include "../fixtures/util.hpp" -#include "../fixtures/mock_view.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/mock_view.hpp> #include <mbgl/map/transform.hpp> #include <mbgl/util/geo.hpp> diff --git a/test/sprite/sprite_atlas.cpp b/test/sprite/sprite_atlas.cpp index 81abbae933..08b8e54002 100644 --- a/test/sprite/sprite_atlas.cpp +++ b/test/sprite/sprite_atlas.cpp @@ -1,5 +1,5 @@ -#include "../fixtures/util.hpp" -#include "../fixtures/fixture_log_observer.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/sprite/sprite_atlas.hpp> #include <mbgl/sprite/sprite_store.hpp> diff --git a/test/sprite/sprite_image.cpp b/test/sprite/sprite_image.cpp index c2e889134f..29e96cf134 100644 --- a/test/sprite/sprite_image.cpp +++ b/test/sprite/sprite_image.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/util/image.hpp> diff --git a/test/sprite/sprite_parser.cpp b/test/sprite/sprite_parser.cpp index 177662db43..6ac155468a 100644 --- a/test/sprite/sprite_parser.cpp +++ b/test/sprite/sprite_parser.cpp @@ -1,5 +1,5 @@ -#include "../fixtures/util.hpp" -#include "../fixtures/fixture_log_observer.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/sprite/sprite_parser.hpp> #include <mbgl/sprite/sprite_image.hpp> diff --git a/test/sprite/sprite_store.cpp b/test/sprite/sprite_store.cpp index ec7b91b875..90f1e3b3f1 100644 --- a/test/sprite/sprite_store.cpp +++ b/test/sprite/sprite_store.cpp @@ -1,7 +1,7 @@ -#include "../fixtures/util.hpp" -#include "../fixtures/fixture_log_observer.hpp" -#include "../fixtures/stub_file_source.hpp" -#include "../fixtures/stub_style_observer.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/fixture_log_observer.hpp> +#include <mbgl/test/stub_file_source.hpp> +#include <mbgl/test/stub_style_observer.hpp> #include <mbgl/sprite/sprite_store.hpp> #include <mbgl/util/run_loop.hpp> diff --git a/test/fixtures/fixture_log_observer.cpp b/test/src/fixture_log_observer.cpp index a6e89e2e79..302fdc7081 100644 --- a/test/fixtures/fixture_log_observer.cpp +++ b/test/src/fixture_log_observer.cpp @@ -1,5 +1,5 @@ -#include "fixture_log_observer.hpp" -#include "../fixtures/util.hpp" +#include <mbgl/test/fixture_log_observer.hpp> +#include <mbgl/test/util.hpp> namespace mbgl { diff --git a/test/fixtures/main.cpp b/test/src/main.cpp index f7b2a6e92f..f2d2944ec7 100644 --- a/test/fixtures/main.cpp +++ b/test/src/main.cpp @@ -1,4 +1,4 @@ -#include "util.hpp" +#include <mbgl/test/util.hpp> GTEST_API_ int main(int argc, char *argv[]) { testing::InitGoogleTest(&argc, argv); diff --git a/test/fixtures/stub_file_source.cpp b/test/src/stub_file_source.cpp index b41eded084..5a062672bb 100644 --- a/test/fixtures/stub_file_source.cpp +++ b/test/src/stub_file_source.cpp @@ -1,4 +1,4 @@ -#include "stub_file_source.hpp" +#include <mbgl/test/stub_file_source.hpp> namespace mbgl { diff --git a/test/fixtures/util.cpp b/test/src/util.cpp index 0829fe72d8..ca2282a4b5 100644 --- a/test/fixtures/util.cpp +++ b/test/src/util.cpp @@ -1,4 +1,4 @@ -#include "util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/map/map.hpp> #include <mbgl/platform/log.hpp> @@ -97,10 +97,12 @@ void checkImage(const std::string& base, const PremultipliedImage& actual, double imageThreshold, double pixelThreshold) { +#if !TEST_READ_ONLY if (getenv("UPDATE")) { util::write_file(base + "/expected.png", encodePNG(actual)); return; } +#endif PremultipliedImage expected = decodeImage(util::read_file(base + "/expected.png")); PremultipliedImage diff { expected.width, expected.height }; @@ -117,8 +119,10 @@ void checkImage(const std::string& base, EXPECT_LE(pixels / (expected.width * expected.height), imageThreshold); +#if !TEST_READ_ONLY util::write_file(base + "/actual.png", encodePNG(actual)); util::write_file(base + "/diff.png", encodePNG(diff)); +#endif } } // namespace test diff --git a/test/storage/headers.cpp b/test/storage/headers.cpp index 2ec409e8e0..3ef4fe25e5 100644 --- a/test/storage/headers.cpp +++ b/test/storage/headers.cpp @@ -1,5 +1,5 @@ #include "storage.hpp" -#include "../fixtures/fixture_log_observer.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/util/http_header.hpp> diff --git a/test/storage/offline_database.cpp b/test/storage/offline_database.cpp index 23269a98ed..4c55ca8bb4 100644 --- a/test/storage/offline_database.cpp +++ b/test/storage/offline_database.cpp @@ -1,4 +1,5 @@ -#include "../fixtures/fixture_log_observer.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/storage/offline_database.hpp> #include <mbgl/storage/resource.hpp> diff --git a/test/storage/offline_download.cpp b/test/storage/offline_download.cpp index 26d0fb29e5..f7fe0b4064 100644 --- a/test/storage/offline_download.cpp +++ b/test/storage/offline_download.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/stub_file_source.hpp" +#include <mbgl/test/stub_file_source.hpp> #include <mbgl/storage/offline.hpp> #include <mbgl/storage/offline_database.hpp> diff --git a/test/storage/storage.cpp b/test/storage/storage.cpp index 91f21107ad..28f64bfb1c 100644 --- a/test/storage/storage.cpp +++ b/test/storage/storage.cpp @@ -1,12 +1,9 @@ #include "storage.hpp" -#include <mbgl/platform/platform.hpp> - std::unique_ptr<mbgl::test::Server> Storage::server; void Storage::SetUpTestCase() { - const auto program = mbgl::platform::applicationRoot() + "/TEST_DATA/storage/server.js"; - server = std::make_unique<mbgl::test::Server>(program.c_str()); + server = std::make_unique<mbgl::test::Server>("test/storage/server.js"); } void Storage::TearDownTestCase() { diff --git a/test/storage/storage.hpp b/test/storage/storage.hpp index 3dc13d0d9f..e7cd960546 100644 --- a/test/storage/storage.hpp +++ b/test/storage/storage.hpp @@ -1,7 +1,7 @@ #ifndef MBGL_TEST_STORAGE_STORAGE #define MBGL_TEST_STORAGE_STORAGE -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/storage/response.hpp> #include <memory> diff --git a/test/style/comparisons.cpp b/test/style/comparisons.cpp index 88f2645be8..4eab5d2cb8 100644 --- a/test/style/comparisons.cpp +++ b/test/style/comparisons.cpp @@ -1,5 +1,5 @@ #include <iostream> -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/tile/vector_tile.hpp> #include <mbgl/style/filter_expression.hpp> diff --git a/test/style/functions.cpp b/test/style/functions.cpp index d19d2ea88e..26b952d7b4 100644 --- a/test/style/functions.cpp +++ b/test/style/functions.cpp @@ -1,5 +1,5 @@ #include <iostream> -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/style/function.hpp> #include <mbgl/style/style_calculation_parameters.hpp> diff --git a/test/style/glyph_store.cpp b/test/style/glyph_store.cpp index ff88841450..126317e7ad 100644 --- a/test/style/glyph_store.cpp +++ b/test/style/glyph_store.cpp @@ -1,6 +1,6 @@ -#include "../fixtures/util.hpp" -#include "../fixtures/stub_file_source.hpp" -#include "../fixtures/stub_style_observer.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/stub_file_source.hpp> +#include <mbgl/test/stub_style_observer.hpp> #include <mbgl/text/font_stack.hpp> #include <mbgl/text/glyph_store.hpp> diff --git a/test/style/source.cpp b/test/style/source.cpp index bbe37fcf05..73367f639f 100644 --- a/test/style/source.cpp +++ b/test/style/source.cpp @@ -1,7 +1,7 @@ -#include "../fixtures/util.hpp" -#include "../fixtures/stub_file_source.hpp" -#include "../fixtures/mock_view.hpp" -#include "../fixtures/stub_style_observer.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/stub_file_source.hpp> +#include <mbgl/test/mock_view.hpp> +#include <mbgl/test/stub_style_observer.hpp> #include <mbgl/source/source.hpp> #include <mbgl/util/run_loop.hpp> diff --git a/test/style/style.cpp b/test/style/style.cpp index 1d3b3beb47..4b01b0a146 100644 --- a/test/style/style.cpp +++ b/test/style/style.cpp @@ -1,5 +1,5 @@ -#include "../fixtures/util.hpp" -#include "../fixtures/stub_file_source.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/stub_file_source.hpp> #include <mbgl/map/map_data.hpp> #include <mbgl/style/style.hpp> diff --git a/test/style/style_layer.cpp b/test/style/style_layer.cpp index 40c4df2b43..3b1d3be337 100644 --- a/test/style/style_layer.cpp +++ b/test/style/style_layer.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/style/style_layer.hpp> #include <mbgl/layer/background_layer.hpp> diff --git a/test/style/style_parser.cpp b/test/style/style_parser.cpp index 64ee4af9fc..f549d638a4 100644 --- a/test/style/style_parser.cpp +++ b/test/style/style_parser.cpp @@ -1,12 +1,11 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> +#include <mbgl/test/fixture_log_observer.hpp> #include <mbgl/style/style_parser.hpp> #include <mbgl/util/io.hpp> #include <rapidjson/document.h> -#include "../fixtures/fixture_log_observer.hpp" - #include <iostream> #include <fstream> diff --git a/test/style/variant.cpp b/test/style/variant.cpp index c55de3d27f..199606d666 100644 --- a/test/style/variant.cpp +++ b/test/style/variant.cpp @@ -1,5 +1,5 @@ #include <iostream> -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/style/value.hpp> #include <mbgl/style/value_comparison.hpp> diff --git a/test/test.gypi b/test/test.gypi index b9ba820e72..fa9c446806 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -2,39 +2,35 @@ 'includes': [ '../gyp/common.gypi', ], + 'targets': [ - { 'target_name': 'symlink_TEST_DATA', - 'type': 'none', - 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'Symlink Fixture Directory', - 'inputs': ['<!@(pwd)/../test'], - 'outputs': ['<(PRODUCT_DIR)/TEST_DATA'], # symlinks the test dir into TEST_DATA - 'action': ['ln', '-s', '-f', '-n', '<@(_inputs)', '<@(_outputs)' ], - } - ], - }, { 'target_name': 'test', 'type': 'executable', - 'include_dirs': [ '../include', '../src', '../platform/default' ], + + 'include_dirs': [ + '../src', + '../platform/default', + 'include', + ], + 'dependencies': [ - 'symlink_TEST_DATA', 'mbgl.gyp:core', 'mbgl.gyp:platform-<(platform_lib)', 'mbgl.gyp:http-<(http_lib)', 'mbgl.gyp:asset-<(asset_lib)', 'mbgl.gyp:headless-<(headless_lib)', ], + 'sources': [ - 'fixtures/main.cpp', - 'fixtures/stub_file_source.cpp', - 'fixtures/stub_file_source.hpp', - 'fixtures/mock_view.hpp', - 'fixtures/util.hpp', - 'fixtures/util.cpp', - 'fixtures/fixture_log_observer.hpp', - 'fixtures/fixture_log_observer.cpp', + # Test helper files + 'src/main.cpp', + 'src/stub_file_source.cpp', + 'include/mbgl/test/stub_file_source.hpp', + 'include/mbgl/test/mock_view.hpp', + 'include/mbgl/test/util.hpp', + 'src/util.cpp', + 'include/mbgl/test/fixture_log_observer.hpp', + 'src/fixture_log_observer.cpp', 'util/assert.cpp', 'util/async_task.cpp', @@ -102,6 +98,7 @@ 'sprite/sprite_parser.cpp', 'sprite/sprite_store.cpp', ], + 'variables': { 'cflags_cc': [ '<@(gtest_cflags)', @@ -123,6 +120,7 @@ '<@(geojsonvt_static_libs)', ], }, + 'conditions': [ ['OS == "mac"', { 'xcode_settings': { diff --git a/test/util/assert.cpp b/test/util/assert.cpp index f3eba009f0..8740bdb201 100644 --- a/test/util/assert.cpp +++ b/test/util/assert.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/util/assert.hpp> diff --git a/test/util/async_task.cpp b/test/util/async_task.cpp index 8073670fe1..95cf160548 100644 --- a/test/util/async_task.cpp +++ b/test/util/async_task.cpp @@ -2,7 +2,7 @@ #include <mbgl/util/run_loop.hpp> #include <mbgl/util/thread.hpp> -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <vector> diff --git a/test/util/clip_ids.cpp b/test/util/clip_ids.cpp index fb7616d8ff..6bb0716a32 100644 --- a/test/util/clip_ids.cpp +++ b/test/util/clip_ids.cpp @@ -1,5 +1,5 @@ #include <iostream> -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <algorithm> diff --git a/test/util/geo.cpp b/test/util/geo.cpp index bdf335dc47..0e00fdc6a3 100644 --- a/test/util/geo.cpp +++ b/test/util/geo.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/geo.hpp> diff --git a/test/util/image.cpp b/test/util/image.cpp index 9886eede45..445b32ce2a 100644 --- a/test/util/image.cpp +++ b/test/util/image.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/util/premultiply.hpp> #include <mbgl/util/image.hpp> diff --git a/test/util/mapbox.cpp b/test/util/mapbox.cpp index 4fc22d3b34..e5da25991d 100644 --- a/test/util/mapbox.cpp +++ b/test/util/mapbox.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/platform/log.hpp> #include <mbgl/util/mapbox.hpp> diff --git a/test/util/math.cpp b/test/util/math.cpp index 0074b43509..c833ca41e2 100644 --- a/test/util/math.cpp +++ b/test/util/math.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/math.hpp> diff --git a/test/util/merge_lines.cpp b/test/util/merge_lines.cpp index ed59182d76..6e7273d48c 100644 --- a/test/util/merge_lines.cpp +++ b/test/util/merge_lines.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/util/merge_lines.hpp> diff --git a/test/util/run_loop.cpp b/test/util/run_loop.cpp index 565ce2c066..57bc613f9e 100644 --- a/test/util/run_loop.cpp +++ b/test/util/run_loop.cpp @@ -1,7 +1,7 @@ #include <mbgl/util/run_loop.hpp> #include <mbgl/util/timer.hpp> -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> using namespace mbgl::util; diff --git a/test/util/text_conversions.cpp b/test/util/text_conversions.cpp index 78d88ed12e..29f02e988a 100644 --- a/test/util/text_conversions.cpp +++ b/test/util/text_conversions.cpp @@ -1,5 +1,5 @@ #include <iostream> -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/util/utf.hpp> #include <mbgl/platform/platform.hpp> diff --git a/test/util/thread.cpp b/test/util/thread.cpp index f60d7d43dd..40e4d8ede4 100644 --- a/test/util/thread.cpp +++ b/test/util/thread.cpp @@ -1,7 +1,7 @@ #include <mbgl/util/thread.hpp> #include <mbgl/util/run_loop.hpp> -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> using namespace mbgl::util; diff --git a/test/util/thread_local.cpp b/test/util/thread_local.cpp index aeaf187540..98b3948fc8 100644 --- a/test/util/thread_local.cpp +++ b/test/util/thread_local.cpp @@ -2,7 +2,7 @@ #include <mbgl/util/thread.hpp> #include <mbgl/util/thread_local.hpp> -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> using namespace mbgl::util; diff --git a/test/util/timer.cpp b/test/util/timer.cpp index 1ac72d8068..71e35da919 100644 --- a/test/util/timer.cpp +++ b/test/util/timer.cpp @@ -5,7 +5,7 @@ #include <memory> -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> using namespace mbgl::util; diff --git a/test/util/token.cpp b/test/util/token.cpp index add31afbad..79da03a97e 100644 --- a/test/util/token.cpp +++ b/test/util/token.cpp @@ -1,5 +1,5 @@ #include <iostream> -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/util/token.hpp> diff --git a/test/util/work_queue.cpp b/test/util/work_queue.cpp index a6cd6c3f88..c8cce4f97b 100644 --- a/test/util/work_queue.cpp +++ b/test/util/work_queue.cpp @@ -1,4 +1,4 @@ -#include "../fixtures/util.hpp" +#include <mbgl/test/util.hpp> #include <mbgl/util/run_loop.hpp> #include <mbgl/util/thread.hpp> |