commit 576c206d29b9de406e7faf6a93c416290b2c08b5
author djsollen <djsollen@google.com> Thu Jan 14 12:23:54 2016 -0800
committer Commit bot <commit-bot@chromium.org> Thu Jan 14 12:23:55 2016 -0800
tree 97e99f05ef7e7886fa6db5bbf065242c8d409536
parent 8afddabeaf5084e09d66a99b80ed2c72fa338e59

Update tests to produce more sensible output for Android framework builds.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1590023002

Review URL: https://codereview.chromium.org/1590023002

src/ports/SkFontMgr_android_parser.cpp

diff --git a/src/ports/SkFontMgr_android_parser.cpp b/src/ports/SkFontMgr_android_parser.cpp
index 29ea525..1d1a3b7 100644
--- a/src/ports/SkFontMgr_android_parser.cpp
+++ b/src/ports/SkFontMgr_android_parser.cpp
@@ -663,11 +663,6 @@
                                                      const char* dir,
                                                      const SkString& basePath)
 {
-#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
-    // The framework is beyond Android 4.2 and can therefore skip this function
-    return;
-#endif
-
     SkAutoTCallIProc<DIR, closedir> fontDirectory(opendir(dir));
     if (nullptr == fontDirectory) {
         return;

tests/KtxTest.cpp

diff --git a/tests/KtxTest.cpp b/tests/KtxTest.cpp
index e0d9a27..84d162c 100644
--- a/tests/KtxTest.cpp
+++ b/tests/KtxTest.cpp
@@ -53,14 +53,21 @@
     REPORTER_ASSERT(reporter, !(bm8888.empty()));
 
     SkAutoDataUnref encodedData(SkImageEncoder::EncodeData(bm8888, SkImageEncoder::kKTX_Type, 0));
-    REPORTER_ASSERT(reporter, encodedData);
+    if (nullptr == encodedData.get()) {
+        ERRORF(reporter, "failed to encode the bitmap to KTX");
+        return;
+    }
+
 
     SkAutoTDelete<SkMemoryStream> stream(new SkMemoryStream(encodedData));
     REPORTER_ASSERT(reporter, stream);
 
     SkBitmap decodedBitmap;
     bool imageDecodeSuccess = SkImageDecoder::DecodeStream(stream, &decodedBitmap);
-    REPORTER_ASSERT(reporter, imageDecodeSuccess);
+    if (!imageDecodeSuccess) {
+        ERRORF(reporter, "failed to decode the KTX stream");
+        return;
+    }
 
     REPORTER_ASSERT(reporter, decodedBitmap.colorType() == bm8888.colorType());
     REPORTER_ASSERT(reporter, decodedBitmap.alphaType() == bm8888.alphaType());
@@ -112,7 +119,10 @@
 
     SkBitmap decodedBitmap;
     bool imageDecodeSuccess = SkImageDecoder::DecodeStream(stream, &decodedBitmap);
-    REPORTER_ASSERT(reporter, imageDecodeSuccess);
+    if (!imageDecodeSuccess) {
+        ERRORF(reporter, "failed to decode the KTX stream");
+        return;
+    }
 
     REPORTER_ASSERT(reporter, decodedBitmap.colorType() == kN32_SkColorType);
     REPORTER_ASSERT(reporter, decodedBitmap.alphaType() == kPremul_SkAlphaType);
@@ -151,7 +161,10 @@
 
     bool installDiscardablePixelRefSuccess =
         SkDEPRECATED_InstallDiscardablePixelRef(fileData, &etcBitmap);
-    REPORTER_ASSERT(reporter, installDiscardablePixelRefSuccess);
+    if (!installDiscardablePixelRefSuccess) {
+        ERRORF(reporter, "failed to create discardable pixelRef from KTX file");
+        return;
+    }
 
     // Write the bitmap out to a KTX file.
     SkData *ktxDataPtr = SkImageEncoder::EncodeData(etcBitmap, SkImageEncoder::kKTX_Type, 0);