diff options
| author | Juha Alanen <juha.alanen@mapbox.com> | 2020-01-24 11:04:35 +0200 |
|---|---|---|
| committer | Juha Alanen <juha.alanen@mapbox.com> | 2020-01-28 10:27:16 +0200 |
| commit | 87b0aebed7a7537f717963d25590f4b412d685f5 (patch) | |
| tree | 50b97b0664b924cd0cb0b94d08e0730bdbe3912b | |
| parent | dc9bd77744af66f682bc6fbb6638caa7178995dc (diff) | |
| download | qtlocation-mapboxgl-87b0aebed7a7537f717963d25590f4b412d685f5.tar.gz | |
[build] Enable unit tests for Qt MacOS builds in CI
| -rw-r--r-- | circle.yml | 1 | ||||
| -rw-r--r-- | test/text/local_glyph_rasterizer.test.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/circle.yml b/circle.yml index 7b062bfd69..cb213421d4 100644 --- a/circle.yml +++ b/circle.yml @@ -134,7 +134,6 @@ workflows: requires: - qt5-linux-gcc5-release config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMBGL_WITH_QT=ON -DCMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/qt/5.*/lib/cmake)' - test_params: '-N -Q' - build-template: name: macos-xcode11-release executor_name: macos-11_0_0 diff --git a/test/text/local_glyph_rasterizer.test.cpp b/test/text/local_glyph_rasterizer.test.cpp index d109b28f32..8fce2c4782 100644 --- a/test/text/local_glyph_rasterizer.test.cpp +++ b/test/text/local_glyph_rasterizer.test.cpp @@ -52,7 +52,7 @@ public: } // end namespace // Enabling Qt requires adding a CJK-compatible font in the CI image. -#if defined(__APPLE__) +#if defined(__APPLE__) && !defined(__QT__) TEST(LocalGlyphRasterizer, PingFang) { LocalGlyphRasterizerTest test(std::string("PingFang")); |