aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/gmmain.cpp
diff options
context:
space:
mode:
authorGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-12 15:52:59 +0000
committerGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-12 15:52:59 +0000
commitc824c83ec1402e68e827e8920278a86793a12c0c (patch)
tree3b35b8f6674575c9c266997e111ab4eb0eff9ae8 /gm/gmmain.cpp
parent1bc995e68cac8621a7efce3c2ccac88da1b8d3c2 (diff)
gm: since we don't record output of gpudebug test, don't record checksums either
BUG=https://code.google.com/p/skia/issues/detail?id=1410 R=robertphillips@google.com Review URL: https://codereview.chromium.org/19096012 git-svn-id: http://skia.googlecode.com/svn/trunk@10046 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/gmmain.cpp')
-rw-r--r--gm/gmmain.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index ab8053e131..0cf7a18462 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -926,6 +926,14 @@ public:
// version of the output.
RecordTestResults(ErrorCombination(kIntentionallySkipped_ErrorType),
shortNamePlusConfig, "");
+ } else if (!(gRec.fFlags & kWrite_ConfigFlag)) {
+ // We don't record the results for this test or compare them
+ // against any expectations, because the output image isn't
+ // meaningful.
+ // See https://code.google.com/p/skia/issues/detail?id=1410 ('some
+ // GM result images not available for download from Google Storage')
+ RecordTestResults(ErrorCombination(kIntentionallySkipped_ErrorType),
+ shortNamePlusConfig, "");
} else {
ExpectationsSource *expectationsSource = this->fExpectationsSource.get();
if (expectationsSource && (gRec.fFlags & kRead_ConfigFlag)) {
@@ -1247,7 +1255,8 @@ static const ConfigData gRec[] = {
{ SkBitmap::kARGB_8888_Config, kGPU_Backend, GrContextFactory::kNative_GLContextType, 0, kRW_ConfigFlag, "gpu", true },
{ SkBitmap::kARGB_8888_Config, kGPU_Backend, GrContextFactory::kNative_GLContextType, 16, kRW_ConfigFlag, "msaa16", false},
{ SkBitmap::kARGB_8888_Config, kGPU_Backend, GrContextFactory::kNative_GLContextType, 4, kRW_ConfigFlag, "msaa4", false},
- /* The debug context does not generate images */
+ /* The gpudebug context does not generate meaningful images, so don't record
+ * the images it generates! We only run it to look for asserts. */
{ SkBitmap::kARGB_8888_Config, kGPU_Backend, GrContextFactory::kDebug_GLContextType, 0, kNone_ConfigFlag, "gpudebug", GR_DEBUG},
#if SK_ANGLE
{ SkBitmap::kARGB_8888_Config, kGPU_Backend, GrContextFactory::kANGLE_GLContextType, 0, kRW_ConfigFlag, "angle", true },