From 666c5cf3afe99220ab66e549717c832c90bd7a0d Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Sat, 19 Jan 2013 04:56:36 +0000 Subject: Fix bugs in r7291 TBR=reed Review URL: https://codereview.appspot.com/7129057 git-svn-id: http://skia.googlecode.com/svn/trunk@7292 2bbb7eff-a529-9590-31e7-b0007b416f81 --- .../aaclip-readback/output-expected/command_line | 2 +- .../output-expected/json-summary.txt | 21 --------------------- .../outputs/aaclip-readback/output-expected/stdout | 5 +---- .../aaclip-write/output-expected/command_line | 2 +- .../aaclip-write/output-expected/json-summary.txt | 9 --------- .../outputs/aaclip-write/output-expected/stdout | 5 +---- gm/tests/run.sh | 7 ++++--- 7 files changed, 8 insertions(+), 43 deletions(-) (limited to 'gm/tests') diff --git a/gm/tests/outputs/aaclip-readback/output-expected/command_line b/gm/tests/outputs/aaclip-readback/output-expected/command_line index 7a7140b936..a33529b81a 100644 --- a/gm/tests/outputs/aaclip-readback/output-expected/command_line +++ b/gm/tests/outputs/aaclip-readback/output-expected/command_line @@ -1 +1 @@ -out/Debug/gm --match aaclip --config 8888 -r gm/tests/tempfiles/aaclip-images --writeJsonSummary gm/tests/outputs/aaclip-readback/output-actual/json-summary.txt +out/Debug/gm --match simpleaaclip_path --config 8888 -r gm/tests/tempfiles/aaclip-images --writeJsonSummary gm/tests/outputs/aaclip-readback/output-actual/json-summary.txt diff --git a/gm/tests/outputs/aaclip-readback/output-expected/json-summary.txt b/gm/tests/outputs/aaclip-readback/output-expected/json-summary.txt index 22ec106f76..b901edd117 100644 --- a/gm/tests/outputs/aaclip-readback/output-expected/json-summary.txt +++ b/gm/tests/outputs/aaclip-readback/output-expected/json-summary.txt @@ -4,36 +4,15 @@ "failure-ignored" : null, "no-comparison" : null, "succeeded" : { - "aaclip_8888" : { - "checksum" : FAKE - }, - "simpleaaclip_aaclip_8888" : { - "checksum" : FAKE - }, "simpleaaclip_path_8888" : { "checksum" : FAKE - }, - "simpleaaclip_rect_8888" : { - "checksum" : FAKE } } }, "expected-results" : { - "aaclip_8888" : { - "checksums" : [ FAKE ], - "ignore-failure" : false - }, - "simpleaaclip_aaclip_8888" : { - "checksums" : [ FAKE ], - "ignore-failure" : false - }, "simpleaaclip_path_8888" : { "checksums" : [ FAKE ], "ignore-failure" : false - }, - "simpleaaclip_rect_8888" : { - "checksums" : [ FAKE ], - "ignore-failure" : false } } } diff --git a/gm/tests/outputs/aaclip-readback/output-expected/stdout b/gm/tests/outputs/aaclip-readback/output-expected/stdout index 188f2a6f0a..52931ca2a5 100644 --- a/gm/tests/outputs/aaclip-readback/output-expected/stdout +++ b/gm/tests/outputs/aaclip-readback/output-expected/stdout @@ -1,6 +1,3 @@ reading from gm/tests/tempfiles/aaclip-images -drawing... aaclip [640 480] -drawing... simpleaaclip_aaclip [640 480] drawing... simpleaaclip_path [640 480] -drawing... simpleaaclip_rect [640 480] -Ran 4 tests: 4 passed, 0 failed, 0 missing reference images +Ran 1 tests: 1 passed, 0 failed, 0 missing reference images diff --git a/gm/tests/outputs/aaclip-write/output-expected/command_line b/gm/tests/outputs/aaclip-write/output-expected/command_line index 5ca94423a5..5669a2008a 100644 --- a/gm/tests/outputs/aaclip-write/output-expected/command_line +++ b/gm/tests/outputs/aaclip-write/output-expected/command_line @@ -1 +1 @@ -out/Debug/gm --match aaclip --config 8888 -w gm/tests/tempfiles/aaclip-images --writeJsonSummary gm/tests/outputs/aaclip-write/output-actual/json-summary.txt +out/Debug/gm --match simpleaaclip_path --config 8888 -w gm/tests/tempfiles/aaclip-images --writeJsonSummary gm/tests/outputs/aaclip-write/output-actual/json-summary.txt diff --git a/gm/tests/outputs/aaclip-write/output-expected/json-summary.txt b/gm/tests/outputs/aaclip-write/output-expected/json-summary.txt index acc99b6b0e..ae32bbb75e 100644 --- a/gm/tests/outputs/aaclip-write/output-expected/json-summary.txt +++ b/gm/tests/outputs/aaclip-write/output-expected/json-summary.txt @@ -3,17 +3,8 @@ "failed" : null, "failure-ignored" : null, "no-comparison" : { - "aaclip_8888" : { - "checksum" : FAKE - }, - "simpleaaclip_aaclip_8888" : { - "checksum" : FAKE - }, "simpleaaclip_path_8888" : { "checksum" : FAKE - }, - "simpleaaclip_rect_8888" : { - "checksum" : FAKE } }, "succeeded" : null diff --git a/gm/tests/outputs/aaclip-write/output-expected/stdout b/gm/tests/outputs/aaclip-write/output-expected/stdout index 093991c604..52116642a7 100644 --- a/gm/tests/outputs/aaclip-write/output-expected/stdout +++ b/gm/tests/outputs/aaclip-write/output-expected/stdout @@ -1,6 +1,3 @@ writing to gm/tests/tempfiles/aaclip-images -drawing... aaclip [640 480] -drawing... simpleaaclip_aaclip [640 480] drawing... simpleaaclip_path [640 480] -drawing... simpleaaclip_rect [640 480] -Ran 4 tests: 0 passed, 0 failed, 4 missing reference images +Ran 1 tests: 0 passed, 0 failed, 1 missing reference images diff --git a/gm/tests/run.sh b/gm/tests/run.sh index 9d1461e745..23e35fef8d 100755 --- a/gm/tests/run.sh +++ b/gm/tests/run.sh @@ -142,7 +142,8 @@ gm_test "--hierarchy --match dashing2 --config 8888 -r $GM_INPUTS/empty-dir" "$G # section should be empty. gm_test "--hierarchy --match dashing2 --config 8888" "$GM_OUTPUTS/no-readpath" -# Write out a handful of test images and read them back in. +# Run a test which generates partially transparent images, write out those +# images, and read them back in. # # This test would have caught # http://code.google.com/p/skia/issues/detail?id=1079 ('gm generating @@ -150,7 +151,7 @@ gm_test "--hierarchy --match dashing2 --config 8888" "$GM_OUTPUTS/no-readpath" IMAGEDIR=$GM_TEMPFILES/aaclip-images rm -rf $IMAGEDIR mkdir -p $IMAGEDIR -gm_test "--match aaclip --config 8888 -w $IMAGEDIR" "$GM_OUTPUTS/aaclip-write" -gm_test "--match aaclip --config 8888 -r $IMAGEDIR" "$GM_OUTPUTS/aaclip-readback" +gm_test "--match simpleaaclip_path --config 8888 -w $IMAGEDIR" "$GM_OUTPUTS/aaclip-write" +gm_test "--match simpleaaclip_path --config 8888 -r $IMAGEDIR" "$GM_OUTPUTS/aaclip-readback" echo "All tests passed." -- cgit v1.2.3