summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDane Springmeyer <dane@mapbox.com>2016-05-03 13:57:17 -0700
committerDane Springmeyer <dane@mapbox.com>2016-05-03 13:57:17 -0700
commitc82b02c508bb4eb1d6ee25320cf83995a807e603 (patch)
tree6e480d2e91e8fb2a053a99a9d0a6a72a746263b1 /test
parent7d1a4c5ec146493bb3e192f7fc20e3ae3b626011 (diff)
downloadqtlocation-mapboxgl-c82b02c508bb4eb1d6ee25320cf83995a807e603.tar.gz
[core] port to protozero (#4906)
Diffstat (limited to 'test')
-rw-r--r--test/style/glyph_store.cpp2
-rw-r--r--test/style/source.cpp2
-rw-r--r--test/test.gypi1
3 files changed, 3 insertions, 2 deletions
diff --git a/test/style/glyph_store.cpp b/test/style/glyph_store.cpp
index 2a874a05a7..08ec6902b9 100644
--- a/test/style/glyph_store.cpp
+++ b/test/style/glyph_store.cpp
@@ -110,7 +110,7 @@ TEST(GlyphStore, LoadingCorrupted) {
EXPECT_EQ(glyphRange, GlyphRange(0, 255));
EXPECT_TRUE(error != nullptr);
- EXPECT_EQ(util::toString(error), "pbf unknown field type exception");
+ EXPECT_EQ(util::toString(error), "unknown pbf field type exception");
auto glyphSet = test.glyphStore.getGlyphSet({{"Test Stack"}});
ASSERT_TRUE(glyphSet->getSDFs().empty());
diff --git a/test/style/source.cpp b/test/style/source.cpp
index 5ec2714b43..7964a05814 100644
--- a/test/style/source.cpp
+++ b/test/style/source.cpp
@@ -269,7 +269,7 @@ TEST(Source, VectorTileCorrupt) {
test.observer.tileError = [&] (Source& source, const TileID& tileID, std::exception_ptr error) {
EXPECT_EQ(source.type, SourceType::Vector);
EXPECT_EQ(std::string(tileID), "0/0/0");
- EXPECT_EQ(util::toString(error), "pbf unknown field type exception");
+ EXPECT_EQ(util::toString(error), "unknown pbf field type exception");
test.end();
};
diff --git a/test/test.gypi b/test/test.gypi
index a9e53c88fc..2326fd7cf9 100644
--- a/test/test.gypi
+++ b/test/test.gypi
@@ -85,6 +85,7 @@
'cflags_cc': [
'<@(gtest_cflags)',
'<@(opengl_cflags)',
+ '<@(protozero_cflags)',
'<@(boost_cflags)',
'<@(sqlite_cflags)',
'<@(geojsonvt_cflags)',