Index: tests/FontConfigParser.cpp |
diff --git a/tests/FontConfigParser.cpp b/tests/FontConfigParser.cpp |
index dfc8093f2a0077526e9e7ed68596b6d3ddc434d9..7478f6397a2f9845724af08b0d07471a738ea925 100644 |
--- a/tests/FontConfigParser.cpp |
+++ b/tests/FontConfigParser.cpp |
@@ -55,6 +55,7 @@ void DumpLoadedFonts(SkTDArray<FontFamily*> fontFamilies) { |
SkDebugf(" file (%d) %s#%d\n", ffi.fWeight, ffi.fFileName.c_str(), ffi.fIndex); |
} |
} |
+ SkDebugf("\n\n"); |
} |
DEF_TEST(FontConfigParserAndroid, reporter) { |
@@ -65,7 +66,8 @@ DEF_TEST(FontConfigParserAndroid, reporter) { |
SkFontConfigParser::GetCustomFontFamilies(preV17FontFamilies, |
SkString("/custom/font/path/"), |
GetResourcePath("android_fonts/pre_v17/system_fonts.xml").c_str(), |
- GetResourcePath("android_fonts/pre_v17/fallback_fonts.xml").c_str()); |
+ GetResourcePath("android_fonts/pre_v17/fallback_fonts.xml").c_str(), |
+ NULL); |
if (preV17FontFamilies.count() > 0) { |
REPORTER_ASSERT(reporter, preV17FontFamilies.count() == 14); |
@@ -82,11 +84,12 @@ DEF_TEST(FontConfigParserAndroid, reporter) { |
SkFontConfigParser::GetCustomFontFamilies(v17FontFamilies, |
SkString("/custom/font/path/"), |
GetResourcePath("android_fonts/v17/system_fonts.xml").c_str(), |
- GetResourcePath("android_fonts/v17/fallback_fonts.xml").c_str()); |
+ GetResourcePath("android_fonts/v17/fallback_fonts.xml").c_str(), |
+ GetResourcePath("android_fonts/v17").c_str()); |
if (v17FontFamilies.count() > 0) { |
- REPORTER_ASSERT(reporter, v17FontFamilies.count() == 41); |
- REPORTER_ASSERT(reporter, CountFallbacks(v17FontFamilies) == 31); |
+ REPORTER_ASSERT(reporter, v17FontFamilies.count() == 56); |
+ REPORTER_ASSERT(reporter, CountFallbacks(v17FontFamilies) == 46); |
DumpLoadedFonts(v17FontFamilies); |
ValidateLoadedFonts(v17FontFamilies, "Roboto-Regular.ttf", reporter); |
@@ -99,6 +102,7 @@ DEF_TEST(FontConfigParserAndroid, reporter) { |
SkFontConfigParser::GetCustomFontFamilies(v22FontFamilies, |
SkString("/custom/font/path/"), |
GetResourcePath("android_fonts/v22/fonts.xml").c_str(), |
+ NULL, |
NULL); |
if (v22FontFamilies.count() > 0) { |