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
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);