From: epoger@google.com Date: Wed, 3 Apr 2013 17:12:42 +0000 (+0000) Subject: roll out r8514 X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~12860 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2212c2e35cd88e9aa2d8d0171d13ea326a2d969a;p=platform%2Fupstream%2FlibSkiaSharp.git roll out r8514 Review URL: https://codereview.chromium.org/13503003 git-svn-id: http://skia.googlecode.com/svn/trunk@8515 2bbb7eff-a529-9590-31e7-b0007b416f81 --- diff --git a/gm/gm_error.h b/gm/gm_error.h index 88040d6..e0dbf1c 100644 --- a/gm/gm_error.h +++ b/gm/gm_error.h @@ -9,23 +9,15 @@ * Error codes used by gmmain.cpp. */ -#ifndef gm_error_DEFINED -#define gm_error_DEFINED - -#include "gm.h" - namespace skiagm { /** * The complete list of error types we might encounter in GM. */ enum ErrorType { - // Even though kNoGpuContext_ErrorType only occurs when SK_SUPPORT_GPU - // is turned on, we always include this type in our enum so that - // reports will be consistent whether SK_SUPPORT_GPU is turned on - // or off (as long as the number of these errors is 0). +#if SK_SUPPORT_GPU kNoGpuContext_ErrorType, - +#endif kImageMismatch_ErrorType, kMissingExpectations_ErrorType, kWritingReferenceImage_ErrorType, @@ -33,25 +25,6 @@ namespace skiagm { }; /** - * Returns the name of the given ErrorType. - */ - const char *getErrorTypeName(ErrorType type) { - switch(type) { - case kNoGpuContext_ErrorType: - return "NoGpuContext"; - case kImageMismatch_ErrorType: - return "ImageMismatch"; - case kMissingExpectations_ErrorType: - return "MissingExpectations"; - case kWritingReferenceImage_ErrorType: - return "WritingReferenceImage"; - } - // control should never reach here - SkDEBUGFAIL("getErrorTypeName() called with unknown type"); - return "Unknown"; - } - - /** * A combination of 0 or more ErrorTypes. */ class ErrorCombination { @@ -114,5 +87,3 @@ namespace skiagm { // No errors at all. const static ErrorCombination kEmpty_ErrorCombination; } - -#endif // ifndef gm_error_DEFINED diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index 6cb47aa..0a8d133 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -34,7 +34,6 @@ #include "SkRefCnt.h" #include "SkStream.h" #include "SkTArray.h" -#include "SkTDict.h" #include "SkTileGridPicture.h" #include "SamplePipeControllers.h" @@ -86,6 +85,14 @@ extern bool gSkSuppressFontCachePurgeSpew; using namespace skiagm; +struct FailRec { + SkString fName; + bool fIsPixelError; + + FailRec() : fIsPixelError(false) {} + FailRec(const SkString& name) : fName(name), fIsPixelError(false) {} +}; + class Iter { public: Iter() { @@ -176,9 +183,12 @@ static PipeFlagComboData gPipeWritingFlagCombos[] = { class GMMain { public: - GMMain() : fUseFileHierarchy(false), fMismatchPath(NULL), fTestsRun(0), - fRenderModesEncountered(1) { + GMMain() { + // Set default values of member variables, which tool_main() + // may override. + fUseFileHierarchy = false; fIgnorableErrorCombination.add(kMissingExpectations_ErrorType); + fMismatchPath = NULL; } SkString make_name(const char shortName[], const char configName[]) { @@ -232,103 +242,34 @@ public: } /** - * Add all render modes encountered thus far to the "modes" array. + * Records the errors encountered in fFailedTests, except for any error + * types we want to ignore. */ - void GetRenderModesEncountered(SkTArray &modes) { - SkTDict::Iter iter(this->fRenderModesEncountered); - const char* mode; - while ((mode = iter.next(NULL)) != NULL) { - SkString modeAsString = SkString(mode); - // TODO(epoger): It seems a bit silly that all of these modes were - // recorded with a leading "-" which we have to remove here - // (except for mode "", which means plain old original mode). - // But that's how renderModeDescriptor has been passed into - // compare_test_results_to_reference_bitmap() historically, - // and changing that now may affect other parts of our code. - if (modeAsString.startsWith("-")) { - modeAsString.remove(0, 1); - modes.push_back(modeAsString); - } - } - } - - /** - * Records the results of this test in fTestsRun and fFailedTests. - * - * We even record successes, and errors that we regard as - * "ignorable"; we can filter them out later. - */ - void RecordTestResults(const ErrorCombination& errorCombination, const SkString& name, - const char renderModeDescriptor []) { - // Things to do regardless of errorCombination. - fTestsRun++; - int renderModeCount = 0; - this->fRenderModesEncountered.find(renderModeDescriptor, &renderModeCount); - renderModeCount++; - this->fRenderModesEncountered.set(renderModeDescriptor, renderModeCount); - + void RecordError(const ErrorCombination& errorCombination, const SkString& name, + const char renderModeDescriptor []) { + // The common case: no error means nothing to record. if (errorCombination.isEmpty()) { return; } - // Things to do only if there is some error condition. - SkString fullName = make_name(name.c_str(), renderModeDescriptor); - for (int typeInt = 0; typeInt <= kLast_ErrorType; typeInt++) { - ErrorType type = static_cast(typeInt); - if (errorCombination.includes(type)) { - fFailedTests[type].push_back(fullName); - } + // If only certain error type(s) were reported, we know we can ignore them. + if (errorCombination.minus(fIgnorableErrorCombination).isEmpty()) { + return; } - } - /** - * Return the number of significant (non-ignorable) errors we have - * encountered so far. - */ - int NumSignificantErrors() { - int significantErrors = 0; - for (int typeInt = 0; typeInt <= kLast_ErrorType; typeInt++) { - ErrorType type = static_cast(typeInt); - if (!fIgnorableErrorCombination.includes(type)) { - significantErrors += fFailedTests[type].count(); - } - } - return significantErrors; + FailRec& rec = fFailedTests.push_back(make_name(name.c_str(), renderModeDescriptor)); + rec.fIsPixelError = errorCombination.includes(kImageMismatch_ErrorType); } - /** - * List contents of fFailedTests to stdout. - */ + // List contents of fFailedTests via SkDebug. void ListErrors() { - // First, print a single summary line. - SkString summary; - summary.appendf("Ran %d tests:", fTestsRun); - for (int typeInt = 0; typeInt <= kLast_ErrorType; typeInt++) { - ErrorType type = static_cast(typeInt); - summary.appendf(" %s=%d", getErrorTypeName(type), fFailedTests[type].count()); - } - gm_fprintf(stdout, "%s\n", summary.c_str()); - - // Now, for each failure type, list the tests that failed that way. - for (int typeInt = 0; typeInt <= kLast_ErrorType; typeInt++) { - SkString line; - ErrorType type = static_cast(typeInt); - if (fIgnorableErrorCombination.includes(type)) { - line.append("[ ] "); + for (int i = 0; i < fFailedTests.count(); ++i) { + if (fFailedTests[i].fIsPixelError) { + gm_fprintf(stderr, "\t\t%s pixel_error\n", fFailedTests[i].fName.c_str()); } else { - line.append("[*] "); - } - - SkTArray *failedTestsOfThisType = &fFailedTests[type]; - int count = failedTestsOfThisType->count(); - line.appendf("%d %s:", count, getErrorTypeName(type)); - for (int i = 0; i < count; ++i) { - line.append(" "); - line.append((*failedTestsOfThisType)[i]); + gm_fprintf(stderr, "\t\t%s\n", fFailedTests[i].fName.c_str()); } - gm_fprintf(stdout, "%s\n", line.c_str()); } - gm_fprintf(stdout, "(results marked with [*] will cause nonzero return value)\n"); } static bool write_document(const SkString& path, @@ -601,16 +542,7 @@ public: } else { gm_fprintf(stderr, "FAILED to write %s\n", path.c_str()); ErrorCombination errors(kWritingReferenceImage_ErrorType); - // TODO(epoger): Don't call RecordTestResults() here... - // Instead, we should make sure to call RecordTestResults - // exactly ONCE per test. (Otherwise, gmmain.fTestsRun - // will be incremented twice for this test: once in - // compare_test_results_to_stored_expectations() before - // that method calls this one, and again here.) - // - // When we make that change, we should probably add a - // WritingReferenceImage test to the gm self-tests.) - RecordTestResults(errors, name, renderModeDescriptor); + RecordError(errors, name, renderModeDescriptor); return errors; } } @@ -722,7 +654,7 @@ public: report_bitmap_diffs(*expectedBitmapPtr, actualBitmap, completeName); } } - RecordTestResults(errors, baseNameString, renderModeDescriptor); + RecordError(errors, baseNameString, renderModeDescriptor); if (addToJsonSummary) { add_actual_results_to_json_summary(completeName, actualChecksum, errors, @@ -838,7 +770,6 @@ public: add_actual_results_to_json_summary(name.c_str(), actualChecksum, ErrorCombination(kMissingExpectations_ErrorType), false); - RecordTestResults(ErrorCombination(kMissingExpectations_ErrorType), name, ""); } // TODO: Consider moving this into compare_to_expectations(), @@ -866,13 +797,6 @@ public: GM* gm, const ConfigData& gRec, const char renderModeDescriptor [], SkBitmap& actualBitmap, const SkBitmap* referenceBitmap) { - // TODO(epoger): This method is run to compare results across - // different rendering modes (as opposed to - // compare_test_results_to_stored_expectations(), which - // compares results against expectations stored on disk). If - // we would like the GenerateGMs step to distinguish between - // those two types of mismatches, we should report image - // mismatches in here with a different ErrorType. SkASSERT(referenceBitmap); SkString name = make_name(gm->shortName(), gRec.fName); Expectations expectations(*referenceBitmap); @@ -986,8 +910,6 @@ public: // ('image-surface gm test is failing in "deferred" mode, // and gm is not reporting the failure') if (errors.isEmpty()) { - // TODO(epoger): Report this as a new ErrorType, - // something like kImageGeneration_ErrorType? return kEmpty_ErrorCombination; } return compare_test_results_to_reference_bitmap( @@ -1061,10 +983,8 @@ public: const char* fMismatchPath; - // collection of tests that have failed with each ErrorType - SkTArray fFailedTests[kLast_ErrorType+1]; - int fTestsRun; - SkTDict fRenderModesEncountered; + // information about all failed tests we have encountered so far + SkTArray fFailedTests; // Where to read expectations (expected image checksums, etc.) from. // If unset, we don't do comparisons. @@ -1372,9 +1292,7 @@ ErrorCombination run_multiple_modes(GMMain &gmmain, GM *gm, const ConfigData &co ErrorCombination errorsForAllModes; uint32_t gmFlags = gm->getFlags(); - // TODO(epoger): We should start recording any per-GM skipped - // modes (i.e. those we skipped due to gmFlags) with a new - // ErrorType, perhaps named kIntentionallySkipped_ErrorType. + // run the picture centric GM steps if (!(gmFlags & GM::kSkipPicture_Flag)) { ErrorCombination pictErrors; @@ -1472,45 +1390,6 @@ ErrorCombination run_multiple_modes(GMMain &gmmain, GM *gm, const ConfigData &co return errorsForAllModes; } -/** - * Return a list of all entries in an array of strings as a single string - * of this form: - * "item1", "item2", "item3" - */ -SkString list_all(const SkTArray &stringArray); -SkString list_all(const SkTArray &stringArray) { - SkString total; - for (int i = 0; i < stringArray.count(); i++) { - if (i > 0) { - total.append(", "); - } - total.append("\""); - total.append(stringArray[i]); - total.append("\""); - } - return total; -} - -/** - * Return a list of configuration names, as a single string of this form: - * "item1", "item2", "item3" - * - * @param configs configurations, as a list of indices into gRec - */ -SkString list_all_config_names(const SkTDArray &configs); -SkString list_all_config_names(const SkTDArray &configs) { - SkString total; - for (int i = 0; i < configs.count(); i++) { - if (i > 0) { - total.append(", "); - } - total.append("\""); - total.append(gRec[configs[i]].fName); - total.append("\""); - } - return total; -} - int tool_main(int argc, char** argv); int tool_main(int argc, char** argv) { @@ -1692,7 +1571,12 @@ int tool_main(int argc, char** argv) { moduloRemainder = -1; } - int gmsRun = 0; + // Accumulate success of all tests. + int testsRun = 0; + int testsPassed = 0; + int testsFailed = 0; + int testsMissingReferenceImages = 0; + int gmIndex = -1; SkString moduloStr; @@ -1732,44 +1616,42 @@ int tool_main(int argc, char** argv) { continue; } - gmsRun++; SkISize size = gm->getISize(); gm_fprintf(stdout, "%sdrawing... %s [%d %d]\n", moduloStr.c_str(), shortName, size.width(), size.height()); - run_multiple_configs(gmmain, gm, configs, grFactory); + ErrorCombination testErrors; + testErrors.add(run_multiple_configs(gmmain, gm, configs, grFactory)); SkBitmap comparisonBitmap; const ConfigData compareConfig = { SkBitmap::kARGB_8888_Config, kRaster_Backend, kDontCare_GLContextType, 0, kRW_ConfigFlag, "comparison", false }; - gmmain.generate_image(gm, compareConfig, NULL, &comparisonBitmap, false); + testErrors.add(gmmain.generate_image(gm, compareConfig, NULL, &comparisonBitmap, false)); // TODO(epoger): only run this if gmmain.generate_image() succeeded? // Otherwise, what are we comparing against? - run_multiple_modes(gmmain, gm, compareConfig, comparisonBitmap, tileGridReplayScales); + testErrors.add(run_multiple_modes(gmmain, gm, compareConfig, comparisonBitmap, + tileGridReplayScales)); + + // Update overall results. + // We only tabulate the particular error types that we currently + // care about (e.g., missing reference images). Later on, if we + // want to also tabulate other error types, we can do so. + testsRun++; + if (!gmmain.fExpectationsSource.get() || + (testErrors.includes(kMissingExpectations_ErrorType))) { + testsMissingReferenceImages++; + } + if (testErrors.minus(gmmain.fIgnorableErrorCombination).isEmpty()) { + testsPassed++; + } else { + testsFailed++; + } SkDELETE(gm); } - - SkTArray modes; - gmmain.GetRenderModesEncountered(modes); - - // Output summary to stdout. - gm_fprintf(stdout, "Ran %d GMs\n", gmsRun); - gm_fprintf(stdout, "... over %2d configs [%s]\n", configs.count(), - list_all_config_names(configs).c_str()); - gm_fprintf(stdout, "... and %2d modes [%s]\n", modes.count(), list_all(modes).c_str()); - gm_fprintf(stdout, "... so there should be a total of %d tests.\n", - gmsRun * (configs.count() + modes.count())); - - // TODO(epoger): Ultimately, we should signal an error if the - // expected total number of tests (displayed above) does not match - // gmmain.fTestsRun. But for now, there are cases where those - // numbers won't match: specifically, if some configs/modes are - // skipped on a per-GM basis (due to gm->getFlags() for a specific - // GM). Later on, we should record tests like that using some new - // ErrorType, like kIntentionallySkipped_ErrorType. Then we could - // signal an error if the totals didn't match up. + gm_fprintf(stdout, "Ran %d tests: %d passed, %d failed, %d missing reference images\n", + testsRun, testsPassed, testsFailed, testsMissingReferenceImages); gmmain.ListErrors(); if (FLAGS_writeJsonSummaryPath.count() == 1) { @@ -1809,7 +1691,7 @@ int tool_main(int argc, char** argv) { #endif SkGraphics::Term(); - return (0 == gmmain.NumSignificantErrors()) ? 0 : -1; + return (0 == testsFailed) ? 0 : -1; } void GMMain::installFilter(SkCanvas* canvas) { diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stderr b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stderr index 3081d2e..3cf1ecd 100644 --- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stderr +++ b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stderr @@ -1,2 +1,4 @@ GM: ---- 8888/selftest1: 60000 (of 60000) differing pixels, max per-channel mismatch R=0 G=111 B=103 A=0 GM: ---- 565/selftest1: not computing max per-channel pixel mismatch because non-8888 +GM: 8888/selftest1 pixel_error +GM: 565/selftest1 pixel_error diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stdout b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stdout index 3067409..955fa27 100644 --- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stdout +++ b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stdout @@ -1,12 +1,3 @@ GM: reading from gm/tests/inputs/images/different-pixels GM: drawing... selftest1 [300 200] -GM: Ran 1 GMs -GM: ... over 2 configs ["8888", "565"] -GM: ... and 7 modes ["pipe", "pipe cross-process", "pipe cross-process, shared address", "replay", "rtree", "serialize", "tilegrid"] -GM: ... so there should be a total of 9 tests. -GM: Ran 9 tests: NoGpuContext=0 ImageMismatch=2 MissingExpectations=0 WritingReferenceImage=0 -GM: [*] 0 NoGpuContext: -GM: [*] 2 ImageMismatch: 8888/selftest1 565/selftest1 -GM: [ ] 0 MissingExpectations: -GM: [*] 0 WritingReferenceImage: -GM: (results marked with [*] will cause nonzero return value) +GM: Ran 1 tests: 0 passed, 1 failed, 0 missing reference images diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stderr b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stderr index e69de29..e30bcb8 100644 --- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stderr +++ b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stderr @@ -0,0 +1,2 @@ +GM: 8888/selftest1 pixel_error +GM: 565/selftest1 pixel_error diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stdout b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stdout index 84b2737..ec3f59f 100644 --- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stdout +++ b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stdout @@ -1,12 +1,3 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/different-pixels.json GM: drawing... selftest1 [300 200] -GM: Ran 1 GMs -GM: ... over 2 configs ["8888", "565"] -GM: ... and 7 modes ["pipe", "pipe cross-process", "pipe cross-process, shared address", "replay", "rtree", "serialize", "tilegrid"] -GM: ... so there should be a total of 9 tests. -GM: Ran 9 tests: NoGpuContext=0 ImageMismatch=2 MissingExpectations=0 WritingReferenceImage=0 -GM: [*] 0 NoGpuContext: -GM: [*] 2 ImageMismatch: 8888/selftest1 565/selftest1 -GM: [ ] 0 MissingExpectations: -GM: [*] 0 WritingReferenceImage: -GM: (results marked with [*] will cause nonzero return value) +GM: Ran 1 tests: 0 passed, 1 failed, 0 missing reference images diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout index a57916e..76a96db 100644 --- a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout +++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout @@ -1,12 +1,3 @@ GM: reading from gm/tests/inputs/images/empty-dir GM: drawing... selftest1 [300 200] -GM: Ran 1 GMs -GM: ... over 2 configs ["8888", "565"] -GM: ... and 7 modes ["pipe", "pipe cross-process", "pipe cross-process, shared address", "replay", "rtree", "serialize", "tilegrid"] -GM: ... so there should be a total of 9 tests. -GM: Ran 9 tests: NoGpuContext=0 ImageMismatch=0 MissingExpectations=2 WritingReferenceImage=0 -GM: [*] 0 NoGpuContext: -GM: [*] 0 ImageMismatch: -GM: [ ] 2 MissingExpectations: 8888/selftest1 565/selftest1 -GM: [*] 0 WritingReferenceImage: -GM: (results marked with [*] will cause nonzero return value) +GM: Ran 1 tests: 1 passed, 0 failed, 1 missing reference images diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stdout b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stdout index c67e5bc..5ea8bc7 100644 --- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stdout +++ b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stdout @@ -1,12 +1,3 @@ GM: reading from gm/tests/inputs/images/identical-bytes GM: drawing... selftest1 [300 200] -GM: Ran 1 GMs -GM: ... over 2 configs ["8888", "565"] -GM: ... and 7 modes ["pipe", "pipe cross-process", "pipe cross-process, shared address", "replay", "rtree", "serialize", "tilegrid"] -GM: ... so there should be a total of 9 tests. -GM: Ran 9 tests: NoGpuContext=0 ImageMismatch=0 MissingExpectations=0 WritingReferenceImage=0 -GM: [*] 0 NoGpuContext: -GM: [*] 0 ImageMismatch: -GM: [ ] 0 MissingExpectations: -GM: [*] 0 WritingReferenceImage: -GM: (results marked with [*] will cause nonzero return value) +GM: Ran 1 tests: 1 passed, 0 failed, 0 missing reference images diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stdout b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stdout index 25f51b5..b3f16b5 100644 --- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stdout +++ b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stdout @@ -1,12 +1,3 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/identical-bytes.json GM: drawing... selftest1 [300 200] -GM: Ran 1 GMs -GM: ... over 2 configs ["8888", "565"] -GM: ... and 7 modes ["pipe", "pipe cross-process", "pipe cross-process, shared address", "replay", "rtree", "serialize", "tilegrid"] -GM: ... so there should be a total of 9 tests. -GM: Ran 9 tests: NoGpuContext=0 ImageMismatch=0 MissingExpectations=0 WritingReferenceImage=0 -GM: [*] 0 NoGpuContext: -GM: [*] 0 ImageMismatch: -GM: [ ] 0 MissingExpectations: -GM: [*] 0 WritingReferenceImage: -GM: (results marked with [*] will cause nonzero return value) +GM: Ran 1 tests: 1 passed, 0 failed, 0 missing reference images diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stdout b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stdout index d23ed86..547cd9d 100644 --- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stdout +++ b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stdout @@ -1,12 +1,3 @@ GM: reading from gm/tests/inputs/images/identical-pixels GM: drawing... selftest1 [300 200] -GM: Ran 1 GMs -GM: ... over 2 configs ["8888", "565"] -GM: ... and 7 modes ["pipe", "pipe cross-process", "pipe cross-process, shared address", "replay", "rtree", "serialize", "tilegrid"] -GM: ... so there should be a total of 9 tests. -GM: Ran 9 tests: NoGpuContext=0 ImageMismatch=0 MissingExpectations=0 WritingReferenceImage=0 -GM: [*] 0 NoGpuContext: -GM: [*] 0 ImageMismatch: -GM: [ ] 0 MissingExpectations: -GM: [*] 0 WritingReferenceImage: -GM: (results marked with [*] will cause nonzero return value) +GM: Ran 1 tests: 1 passed, 0 failed, 0 missing reference images diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stdout b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stdout index 147c383..3ad0d0a 100644 --- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stdout +++ b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stdout @@ -1,12 +1,3 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/identical-pixels.json GM: drawing... selftest1 [300 200] -GM: Ran 1 GMs -GM: ... over 2 configs ["8888", "565"] -GM: ... and 7 modes ["pipe", "pipe cross-process", "pipe cross-process, shared address", "replay", "rtree", "serialize", "tilegrid"] -GM: ... so there should be a total of 9 tests. -GM: Ran 9 tests: NoGpuContext=0 ImageMismatch=0 MissingExpectations=0 WritingReferenceImage=0 -GM: [*] 0 NoGpuContext: -GM: [*] 0 ImageMismatch: -GM: [ ] 0 MissingExpectations: -GM: [*] 0 WritingReferenceImage: -GM: (results marked with [*] will cause nonzero return value) +GM: Ran 1 tests: 1 passed, 0 failed, 0 missing reference images diff --git a/gm/tests/outputs/no-readpath/output-expected/stdout b/gm/tests/outputs/no-readpath/output-expected/stdout index e3b101e..a46b605 100644 --- a/gm/tests/outputs/no-readpath/output-expected/stdout +++ b/gm/tests/outputs/no-readpath/output-expected/stdout @@ -1,11 +1,2 @@ GM: drawing... selftest1 [300 200] -GM: Ran 1 GMs -GM: ... over 2 configs ["8888", "565"] -GM: ... and 7 modes ["pipe", "pipe cross-process", "pipe cross-process, shared address", "replay", "rtree", "serialize", "tilegrid"] -GM: ... so there should be a total of 9 tests. -GM: Ran 9 tests: NoGpuContext=0 ImageMismatch=0 MissingExpectations=2 WritingReferenceImage=0 -GM: [*] 0 NoGpuContext: -GM: [*] 0 ImageMismatch: -GM: [ ] 2 MissingExpectations: 8888/selftest1 565/selftest1 -GM: [*] 0 WritingReferenceImage: -GM: (results marked with [*] will cause nonzero return value) +GM: Ran 1 tests: 1 passed, 0 failed, 1 missing reference images