Ignore failure on more GTX660 GMs

verttext_msaa16
megalooper_0x0_nvprmsaa4
megalooper_1x4_nvprmsaa4

BUG=skia:2354
NOTRY=true
R=epoger@google.com, bsalomon@google.com

Author: borenet@google.com

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

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

4 files changed, 50 insertions, 38 deletions

diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
index 99a489d2e2..8cbafa846f 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
@@ -13537,10 +13537,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
-      ],  
+      ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_0x0_nvprmsaa4.png": {
@@ -13551,8 +13551,9 @@
         ]
       ], 
       "bugs": [
-        2325
+        2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_0x0_pdf-poppler.png": {
@@ -13610,10 +13611,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_1x4_nvprmsaa4.png": {
@@ -13624,8 +13625,9 @@
         ]
       ], 
       "bugs": [
-        2325
+        2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_1x4_pdf-poppler.png": {
@@ -13683,10 +13685,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_4x1_nvprmsaa4.png": {
@@ -13696,10 +13698,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_4x1_pdf-poppler.png": {
@@ -13751,10 +13753,10 @@
           18053729995632638218
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "mixed_xfermodes_nvprmsaa4.png": {
@@ -15192,10 +15194,10 @@
           12915657818379420968
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "poly2poly_nvprmsaa4.png": {
@@ -19630,8 +19632,9 @@
         ]
       ], 
       "bugs": [
-        2325
+        2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "verttext_nvprmsaa4.png": {
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
index 5cadbcab5b..d5e4662327 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
@@ -13537,10 +13537,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_0x0_nvprmsaa4.png": {
@@ -13551,8 +13551,9 @@
         ]
       ], 
       "bugs": [
-        2325
+        2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_0x0_pdf-poppler.png": {
@@ -13610,10 +13611,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_1x4_nvprmsaa4.png": {
@@ -13624,8 +13625,9 @@
         ]
       ], 
       "bugs": [
-        2325
+        2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_1x4_pdf-poppler.png": {
@@ -13683,10 +13685,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_4x1_nvprmsaa4.png": {
@@ -13696,10 +13698,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_4x1_pdf-poppler.png": {
@@ -13751,10 +13753,10 @@
           7068817626419515805
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "mixed_xfermodes_nvprmsaa4.png": {
@@ -15192,10 +15194,10 @@
           12915657818379420968
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "poly2poly_nvprmsaa4.png": {
@@ -19647,8 +19649,9 @@
         ]
       ], 
       "bugs": [
-        2325
+        2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "verttext_nvprmsaa4.png": {
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
index 3864635ed5..5df4f62c21 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
@@ -13540,10 +13540,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_0x0_nvprmsaa4.png": {
@@ -13554,8 +13554,9 @@
         ]
       ], 
       "bugs": [
-        2325
+        2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_0x0_pdf-poppler.png": {
@@ -13613,10 +13614,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_1x4_nvprmsaa4.png": {
@@ -13627,8 +13628,9 @@
         ]
       ], 
       "bugs": [
-        2325
+        2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_1x4_pdf-poppler.png": {
@@ -13686,10 +13688,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_4x1_nvprmsaa4.png": {
@@ -13699,10 +13701,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
-      ],  
+      ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_4x1_pdf-poppler.png": {
@@ -13754,10 +13756,10 @@
           7068817626419515805
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "mixed_xfermodes_nvprmsaa4.png": {
@@ -15194,10 +15196,10 @@
           12915657818379420968
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "poly2poly_nvprmsaa4.png": {
@@ -19632,8 +19634,9 @@
         ]
       ], 
       "bugs": [
-        2325
+        2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "verttext_nvprmsaa4.png": {
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
index 695b4674a9..c80c9584d7 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
@@ -13540,10 +13540,10 @@
           10807026657174943320
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_0x0_nvprmsaa4.png": {
@@ -13554,8 +13554,9 @@
         ]
       ], 
       "bugs": [
-        2325
+        2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_0x0_pdf-poppler.png": {
@@ -13613,10 +13614,10 @@
           10807026657174943320
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_1x4_nvprmsaa4.png": {
@@ -13627,8 +13628,9 @@
         ]
       ], 
       "bugs": [
-        2325
+        2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_1x4_pdf-poppler.png": {
@@ -13686,10 +13688,10 @@
           10807026657174943320
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_4x1_nvprmsaa4.png": {
@@ -13699,10 +13701,10 @@
           10769322296615755298
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "megalooper_4x1_pdf-poppler.png": {
@@ -13754,10 +13756,10 @@
           18053729995632638218
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "mixed_xfermodes_nvprmsaa4.png": {
@@ -15194,10 +15196,10 @@
           12915657818379420968
         ]
       ], 
-      "ignore-failure": true,
       "bugs": [
         2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "poly2poly_nvprmsaa4.png": {
@@ -19656,8 +19658,9 @@
         ]
       ], 
       "bugs": [
-        2325
+        2354
       ], 
+      "ignore-failure": true, 
       "reviewed-by-human": false
     }, 
     "verttext_nvprmsaa4.png": {