Add REPORTF test macro.

tests/GpuBitmapCopyTest.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #if SK_SUPPORT_GPU
 
@@ skipping 132 matching lines @@
 
             // Extract a subset. If this succeeds we will test copying the subset.
             SkBitmap subset;
             const bool extracted = src.extractSubset(&subset, subsetRect);
 
             for (size_t j = 0; j < SK_ARRAY_COUNT(gPairs); j++) {
                 dst.reset();
                 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);
 
                 // Test copying the subset bitmap, using both copyTo and deepCopyTo.
                 if (extracted) {
                     SkBitmap subsetCopy;
                     success = subset.copyTo(&subsetCopy, gPairs[j].fConfig);
                     REPORTER_ASSERT(reporter, success == expected);
                     REPORTER_ASSERT(reporter, success == canSucceed);
@@ skipping 10 matching lines @@
                 }
             } // for (size_t j = ...
         } // for (size_t i = ...
     } // GrContextFactory::GLContextType
 }
 
 #include "TestClassDef.h"
 DEFINE_GPUTESTCLASS("GpuBitmapCopy", TestGpuBitmapCopyClass, TestGpuBitmapCopy)
 
 #endif