| Index: tests/GpuBitmapCopyTest.cpp
|
| diff --git a/tests/GpuBitmapCopyTest.cpp b/tests/GpuBitmapCopyTest.cpp
|
| index 6e1d74dd977c3f942bfd557fc6f74154fbe0db25..a1434dcf11d9b51e29032166d614ce0684cd7dc4 100644
|
| --- a/tests/GpuBitmapCopyTest.cpp
|
| +++ b/tests/GpuBitmapCopyTest.cpp
|
| @@ -150,21 +150,18 @@ static void TestGpuBitmapCopy(skiatest::Reporter* reporter, GrContextFactory* fa
|
| bool success = src.deepCopyTo(&dst, gPairs[j].fConfig);
|
| bool expected = gPairs[i].fValid[j] != '0';
|
| if (success != expected) {
|
| - SkString str;
|
| - str.printf("SkBitmap::deepCopyTo from %s to %s. expected %s returned %s",
|
| - gConfigName[i], gConfigName[j], boolStr(expected),
|
| - boolStr(success));
|
| - reporter->reportFailed(str);
|
| + ERRORF(reporter, "SkBitmap::deepCopyTo from %s to %s. "
|
| + "expected %s returned %s", gConfigName[i],
|
| + gConfigName[j], boolStr(expected),
|
| + boolStr(success));
|
| }
|
|
|
| bool canSucceed = src.canCopyTo(gPairs[j].fConfig);
|
| if (success != canSucceed) {
|
| - SkString str;
|
| - str.printf("SkBitmap::deepCopyTo from %s to %s returned %s,"
|
| - "but canCopyTo returned %s",
|
| - gConfigName[i], gConfigName[j], boolStr(success),
|
| - boolStr(canSucceed));
|
| - reporter->reportFailed(str);
|
| + ERRORF(reporter, "SkBitmap::deepCopyTo from %s to %s "
|
| + "returned %s, but canCopyTo returned %s",
|
| + gConfigName[i], gConfigName[j], boolStr(success),
|
| + boolStr(canSucceed));
|
| }
|
|
|
| TestIndividualCopy(reporter, gPairs[j].fConfig, success, src, dst);
|
|
|