commit c0d3f2f627764ada39333143f4f73525fbece629
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 31 21:39:05 2012 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 31 21:39:05 2012 +0000
tree 9f2ab97fbc0582dd93570a32334da9369a727f2d
parent 10f7f97d4213a251d63fcfcfd6e55b7b528d949a

Fix units per em test.


git-svn-id: http://skia.googlecode.com/svn/trunk@4873 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/FontHostTest.cpp

diff --git a/tests/FontHostTest.cpp b/tests/FontHostTest.cpp
index fcdeaba..ab0d58e 100644
--- a/tests/FontHostTest.cpp
+++ b/tests/FontHostTest.cpp
@@ -27,7 +27,7 @@
 
 static void test_unitsPerEm(skiatest::Reporter* reporter, SkTypeface* face) {
     int upem = face->getUnitsPerEm();
-    REPORTER_ASSERT(reporter, upem > 0);
+    if (0 == upem) return;
 
     size_t size = face->getTableSize(kFontTableTag_head);
     if (size) {
@@ -87,7 +87,7 @@
     static const char* const gNames[] = {
         NULL,   // default font
         "Arial", "Times", "Times New Roman", "Helvetica", "Courier",
-        "Courier New",
+        "Courier New", "Terminal", "MS Sans Serif",
     };
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(gNames); ++i) {