summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeigo Nonaka <nona@google.com>2018-02-22 14:14:33 -0800
committerSeigo Nonaka <nona@google.com>2018-02-22 16:07:30 -0800
commit3998e6fc7fb9cdd27e056253fa2af6de221da926 (patch)
tree3a7008bcb40a2f51b62f40e79867d5c532e5807e
parent5f923f5f9647308c6f41ce7fe561a7213c24ddda (diff)
downloadminikin-3998e6fc7fb9cdd27e056253fa2af6de221da926.tar.gz
Fix test failure due to data directory detection logic change
The font data path resolving logic was changed in I01c8b885ce196f2f628d347c187691805a4d9c71. But the failing test was introduced just before this change. Need to update the test code for resolving the font path. Bug: 73786894 Test: minikin_tests Change-Id: I4010a221fb2a22062095c4c3ffeb646a0d0f5d51
-rw-r--r--tests/util/FontTestUtils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/util/FontTestUtils.cpp b/tests/util/FontTestUtils.cpp
index f26ef3e..8aaac3d 100644
--- a/tests/util/FontTestUtils.cpp
+++ b/tests/util/FontTestUtils.cpp
@@ -129,7 +129,7 @@ std::shared_ptr<FontFamily> buildFontFamily(const std::string& filePath) {
}
std::shared_ptr<FontFamily> buildFontFamily(const std::string& filePath, const std::string& lang) {
- auto font = std::make_shared<FreeTypeMinikinFontForTest>(filePath);
+ auto font = std::make_shared<FreeTypeMinikinFontForTest>(getTestFontPath(filePath));
std::vector<Font> fonts;
fonts.push_back(Font::Builder(font).build());
return std::make_shared<FontFamily>(LocaleListCache::getId(lang), FontFamily::Variant::DEFAULT,