make ignored-tests.txt specify full test name, not partial name

BUG=skia:2022
R=bsalomon@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/136883006

git-svn-id: http://skia.googlecode.com/svn/trunk@13060 2bbb7eff-a529-9590-31e7-b0007b416f81

7 files changed, 25 insertions, 6 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 18957b9954..6c9250df26 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 --ignoreFailuresFile gm/tests/inputs/ignored-tests.txt --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 selftest --ignoreFailuresFile gm/tests/inputs/ignored-tests.txt --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 a639f7f2bd..1b667830ad 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,9 +1,11 @@
 {
    "actual-results" : {
       "failed" : {
-         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ]
+         "565/selftest2.png" : [ "bitmap-64bitMD5", 8863920166200910451 ],
+         "8888/selftest2.png" : [ "bitmap-64bitMD5", 13451349865803053525 ]
       },
       "failure-ignored" : {
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
          "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       },
       "no-comparison" : null,
@@ -14,6 +16,12 @@
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 8863920166200910451 ]
          ],
+         "ignore-failure" : true
+      },
+      "565/selftest2.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 12927999507540085554 ]
+         ],
          "ignore-failure" : false
       },
       "8888/selftest1.png" : {
@@ -21,6 +29,12 @@
             [ "bitmap-64bitMD5", 13451349865803053525 ]
          ],
          "ignore-failure" : true
+      },
+      "8888/selftest2.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 1209453360120438698 ]
+         ],
+         "ignore-failure" : false
       }
    }
 }
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/selftest2.png b/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/selftest2.png
new file mode 100644
index 0000000000..dab977ad2b
--- /dev/null
+++ b/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/selftest2.png
@@ -0,0 +1 @@
+[contents of gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath/565/selftest2.png]
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/selftest2.png b/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/selftest2.png
new file mode 100644
index 0000000000..882a446881
--- /dev/null
+++ b/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/selftest2.png
@@ -0,0 +1 @@
+[contents of gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath/8888/selftest2.png]
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/stdout b/gm/tests/outputs/ignoring-one-test/output-expected/stdout
index af45a03554..328cb86e1e 100644
--- a/gm/tests/outputs/ignoring-one-test/output-expected/stdout
+++ b/gm/tests/outputs/ignoring-one-test/output-expected/stdout
@@ -4,17 +4,18 @@ GM: writing to gm/tests/outputs/ignoring-one-test/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/ignoring-one-test/output-actual/missingExpectationsPath
 GM: reading resources from resources
+GM: drawing... selftest2 [300 200]
 GM: drawing... selftest1 [300 200]
-GM: Ran 1 GMs
+GM: Ran 2 GMs
 GM: ... over  2 configs ["8888", "565"]
 GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 2 tests.
-GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0
+GM: ... so there should be a total of 4 tests.
+GM: Ran 4 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=4 MissingExpectations=0 WritingReferenceImage=0
 GM: [*] 0 NoGpuContext:
 GM: [ ] 0 IntentionallySkipped:
 GM: [*] 0 RenderModeMismatch:
 GM: [*] 0 GeneratePdfFailed:
-GM: [*] 2 ExpectationsMismatch: 8888/selftest1 565/selftest1
+GM: [*] 4 ExpectationsMismatch: 8888/selftest2 565/selftest2 8888/selftest1 565/selftest1
 GM: [ ] 0 MissingExpectations:
 GM: [*] 0 WritingReferenceImage:
 GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/selftest2.png b/gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/selftest2.png
new file mode 100644
index 0000000000..b11088fd90
--- /dev/null
+++ b/gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/selftest2.png
@@ -0,0 +1 @@
+[contents of gm/tests/outputs/ignoring-one-test/output-actual/writePath/565/selftest2.png]
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/selftest2.png b/gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/selftest2.png
new file mode 100644
index 0000000000..3eeb0084e9
--- /dev/null
+++ b/gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/selftest2.png
@@ -0,0 +1 @@
+[contents of gm/tests/outputs/ignoring-one-test/output-actual/writePath/8888/selftest2.png]