diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-07 18:55:09 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-07 18:55:09 +0000 |
| commit | 3a882dda0787e6957cfb37f6b5a68bcd31ce5cf7 (patch) | |
| tree | 8942ac5059099d69f98e5cf2cf972b108a317774 /gm/tests/outputs | |
| parent | 680963ec83b910f926e2bfae3d212f123bd4fb6c (diff) | |
GM: Allow ignored-tests.txt to list configs as well as tests (and combinations too)
BUG=skia:1657
This will allow us to ignore poppler failures until bug 1657 is resolved
(but this CL doesn't actually make that change to ignored-tests.txt yet)
R=scroggo@google.com
Review URL: https://codereview.chromium.org/26294004
git-svn-id: http://skia.googlecode.com/svn/trunk@11639 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/tests/outputs')
| -rw-r--r-- | gm/tests/outputs/ignoring-one-test/output-expected/command_line | 2 | ||||
| -rw-r--r-- | gm/tests/outputs/ignoring-one-test/output-expected/json-summary.txt | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/command_line b/gm/tests/outputs/ignoring-one-test/output-expected/command_line index 49025adbc1..5f5f66eb81 100644 --- a/gm/tests/outputs/ignoring-one-test/output-expected/command_line +++ b/gm/tests/outputs/ignoring-one-test/output-expected/command_line @@ -1 +1 @@ -out/Debug/gm --verbose --hierarchy --match selftest1 --ignoreTests selftest1 --config 8888 565 -r gm/tests/inputs/json/different-pixels.json --writeJsonSummaryPath gm/tests/outputs/ignoring-one-test/output-actual/json-summary.txt --writePath gm/tests/outputs/ignoring-one-test/output-actual/writePath --mismatchPath gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/ignoring-one-test/output-actual/missingExpectationsPath +out/Debug/gm --verbose --hierarchy --match selftest1 --ignoreTests 8888/selfte --config 8888 565 -r gm/tests/inputs/json/different-pixels.json --writeJsonSummaryPath gm/tests/outputs/ignoring-one-test/output-actual/json-summary.txt --writePath gm/tests/outputs/ignoring-one-test/output-actual/writePath --mismatchPath gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/ignoring-one-test/output-actual/missingExpectationsPath diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/json-summary.txt b/gm/tests/outputs/ignoring-one-test/output-expected/json-summary.txt index 5f8aa4e78a..a639f7f2bd 100644 --- a/gm/tests/outputs/ignoring-one-test/output-expected/json-summary.txt +++ b/gm/tests/outputs/ignoring-one-test/output-expected/json-summary.txt @@ -1,8 +1,9 @@ { "actual-results" : { - "failed" : null, + "failed" : { + "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ] + }, "failure-ignored" : { - "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ], "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ] }, "no-comparison" : null, @@ -13,7 +14,7 @@ "allowed-digests" : [ [ "bitmap-64bitMD5", 8863920166200910451 ] ], - "ignore-failure" : true + "ignore-failure" : false }, "8888/selftest1.png" : { "allowed-digests" : [ |