| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "Test.h" | 8 #include "Test.h" |
| 9 | 9 |
| 10 #include "SkCommandLineFlags.h" | 10 #include "SkCommandLineFlags.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 fs.weight(), fs.width(), fs.isItalic()); | 63 fs.weight(), fs.width(), fs.isItalic()); |
| 64 } | 64 } |
| 65 } | 65 } |
| 66 } | 66 } |
| 67 } | 67 } |
| 68 | 68 |
| 69 DEFINE_bool(verboseFontMgr, false, "run verbose fontmgr tests."); | 69 DEFINE_bool(verboseFontMgr, false, "run verbose fontmgr tests."); |
| 70 | 70 |
| 71 static void TestFontMgr(skiatest::Reporter* reporter) { | 71 static void TestFontMgr(skiatest::Reporter* reporter) { |
| 72 test_fontiter(reporter, FLAGS_verboseFontMgr); | 72 test_fontiter(reporter, FLAGS_verboseFontMgr); |
| 73 // The badnames test fails on Android because "sans" is not a valid alias |
| 74 #if !defined(SK_BUILD_FOR_ANDROID) |
| 73 test_badnames(reporter); | 75 test_badnames(reporter); |
| 76 #endif |
| 74 } | 77 } |
| 75 | 78 |
| 76 #include "TestClassDef.h" | 79 #include "TestClassDef.h" |
| 77 DEFINE_TESTCLASS("FontMgr", FontMgrClass, TestFontMgr) | 80 DEFINE_TESTCLASS("FontMgr", FontMgrClass, TestFontMgr) |
| OLD | NEW |