commit b30d4812c76e7094c471ea3f2b07c1cf99786936
author Julia Lavrova <jlavrova@google.com> Fri Nov 08 14:51:16 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 08 21:22:37 2019 +0000
tree c4710904aa33e1c1cde514df094990871dcf2990
parent 6e4aad91c321aa9bbf8078faee4c4bf0d7e882a5

Yet another build fix

Change-Id: I606689930c9d07dbba3e743d1137e7c3c54790d4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/253736
Commit-Queue: Julia Lavrova <jlavrova@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

tests/SkParagraphTest.cpp

diff --git a/tests/SkParagraphTest.cpp b/tests/SkParagraphTest.cpp
index cd06d16..94593f5 100644
--- a/tests/SkParagraphTest.cpp
+++ b/tests/SkParagraphTest.cpp
@@ -13,6 +13,8 @@
 #include "tools/Resources.h"
 #include "tools/ToolUtils.h"
 
+#include "third_party/icu/SkLoadICU.h"
+
 #define VeryLongCanvasWidth 1000000
 #define TestCanvasWidth 1000
 #define TestCanvasHeight 600
@@ -48,6 +50,10 @@
         std::vector<SkString> fonts;
         SkOSFile::Iter iter(fResourceDir.c_str());
 
+        if (!SkLoadICU()) {
+            SkDebugf("ICU not loaded, skipping all the tests\n");
+            return;
+        }
         SkString path;
         while (iter.next(&path)) {
             if (path.endsWith("Roboto-Italic.ttf")) {
@@ -57,6 +63,7 @@
         }
 
         if (!fFontsFound) {
+            SkDebugf("Fonts not found, skipping all the tests\n");
             return;
         }
         // Only register fonts if we have to
@@ -72,8 +79,6 @@
             this->setAssetFontManager(std::move(fFontProvider));
         }
         this->disableFontFallback();
-
-        if (!fFontsFound) SkDebugf("Fonts not found, skipping all the tests\n");
     }
 
     ~ResourceFontCollection() = default;
@@ -4844,7 +4849,7 @@
     REPORTER_ASSERT(reporter, paragraph->getHeight() == 28);
 }
 
-DEF_TEST(SkParagraph_FontResolutions, reporter) {
+DEF_TEST_DISABLED(SkParagraph_FontResolutions, reporter) {
     TestCanvas canvas("SkParagraph_FontResolutions.png");
 
     sk_sp<TestFontCollection> fontCollection =
@@ -4901,7 +4906,7 @@
     paragraph->paint(canvas.get(), 100, 100);
 }
 
-DEF_TEST(SkParagraph_FontStyle, reporter) {
+DEF_TEST_DISABLED(SkParagraph_FontStyle, reporter) {
     TestCanvas canvas("SkParagraph_FontStyle.png");
 
     sk_sp<TestFontCollection> fontCollection = sk_make_sp<TestFontCollection>(GetResourcePath("fonts").c_str(), false, true);
@@ -4939,13 +4944,9 @@
     paragraph->paint(canvas.get(), 0, 0);
 }
 
-DEF_TEST(SkParagraph_Shaping, reporter) {
+DEF_TEST_DISABLED(SkParagraph_Shaping, reporter) {
     TestCanvas canvas("SkParagraph_Shaping.png");
 
-    //sk_sp<FontCollection> fontCollection = sk_make_sp<FontCollection>();
-    //fontCollection->setDefaultFontManager(SkFontMgr::RefDefault());
-    //fontCollection->enableFontFallback();
-
     auto dir = "/usr/local/google/home/jlavrova/Sources/flutter/engine/src/out/host_debug_unopt_x86/gen/flutter/third_party/txt/assets";
     sk_sp<TestFontCollection> fontCollection =
             sk_make_sp<TestFontCollection>(dir, /*GetResourcePath("fonts").c_str(), */ false);