| OLD | NEW | 
|---|
| 1 # | 1 # | 
| 2 # Copyright 2015 Google Inc. | 2 # Copyright 2015 Google Inc. | 
| 3 # | 3 # | 
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be | 
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. | 
| 6 # | 6 # | 
| 7 | 7 | 
| 8 #!/usr/bin/env python | 8 #!/usr/bin/env python | 
| 9 | 9 | 
| 10 usage = ''' | 10 usage = ''' | 
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 105   blacklist.extend('_ image subset pal8os2v2-16.bmp'.split(' ')) | 105   blacklist.extend('_ image subset pal8os2v2-16.bmp'.split(' ')) | 
| 106   blacklist.extend('_ image subset pal8oversizepal.bmp'.split(' ')) | 106   blacklist.extend('_ image subset pal8oversizepal.bmp'.split(' ')) | 
| 107   blacklist.extend('_ image subset 4bpp-pixeldata-cropped.bmp'.split(' ')) | 107   blacklist.extend('_ image subset 4bpp-pixeldata-cropped.bmp'.split(' ')) | 
| 108   blacklist.extend('_ image subset 8bpp-pixeldata-cropped.bmp'.split(' ')) | 108   blacklist.extend('_ image subset 8bpp-pixeldata-cropped.bmp'.split(' ')) | 
| 109   blacklist.extend('_ image subset 24bpp-pixeldata-cropped.bmp'.split(' ')) | 109   blacklist.extend('_ image subset 24bpp-pixeldata-cropped.bmp'.split(' ')) | 
| 110   blacklist.extend('_ image subset 32bpp-pixeldata-cropped.bmp'.split(' ')) | 110   blacklist.extend('_ image subset 32bpp-pixeldata-cropped.bmp'.split(' ')) | 
| 111 | 111 | 
| 112   # New ico files that fail on SkImageDecoder | 112   # New ico files that fail on SkImageDecoder | 
| 113   blacklist.extend('_ image decode Hopstarter-Mac-Folders-Apple.ico'.split(' ')) | 113   blacklist.extend('_ image decode Hopstarter-Mac-Folders-Apple.ico'.split(' ')) | 
| 114 | 114 | 
|  | 115   # Incomplete image tests that fail on SkImageDecoder | 
|  | 116   blacklist.extend('_ image decode inc0.gif'.split(' ')) | 
|  | 117   blacklist.extend('_ image decode inc1.gif'.split(' ')) | 
|  | 118   blacklist.extend('_ image decode incInterlaced.gif'.split(' ')) | 
|  | 119   blacklist.extend('_ image decode inc0.jpg'.split(' ')) | 
|  | 120   blacklist.extend('_ image decode incGray.jpg'.split(' ')) | 
|  | 121   blacklist.extend('_ image decode inc0.wbmp'.split(' ')) | 
|  | 122   blacklist.extend('_ image decode inc1.wbmp'.split(' ')) | 
|  | 123   blacklist.extend('_ image decode inc0.webp'.split(' ')) | 
|  | 124   blacklist.extend('_ image decode inc1.webp'.split(' ')) | 
|  | 125   blacklist.extend('_ image decode inc0.ico'.split(' ')) | 
|  | 126   blacklist.extend('_ image decode inc1.ico'.split(' ')) | 
|  | 127   blacklist.extend('_ image decode inc0.png'.split(' ')) | 
|  | 128   blacklist.extend('_ image decode inc1.png'.split(' ')) | 
|  | 129   blacklist.extend('_ image decode inc2.png'.split(' ')) | 
|  | 130   blacklist.extend('_ image decode inc12.png'.split(' ')) | 
|  | 131   blacklist.extend('_ image decode inc13.png'.split(' ')) | 
|  | 132   blacklist.extend('_ image decode inc14.png'.split(' ')) | 
|  | 133   blacklist.extend('_ image subset inc0.webp'.split(' ')) | 
|  | 134   blacklist.extend('_ image subset inc1.webp'.split(' ')) | 
|  | 135 | 
| 115   # Leon doesn't care about this, so why run it? | 136   # Leon doesn't care about this, so why run it? | 
| 116   if 'Win' in bot: | 137   if 'Win' in bot: | 
| 117     blacklist.extend('_ image decode _'.split(' ')) | 138     blacklist.extend('_ image decode _'.split(' ')) | 
| 118     blacklist.extend('_ image subset _'.split(' ')) | 139     blacklist.extend('_ image subset _'.split(' ')) | 
| 119 | 140 | 
| 120   # Certain gm's on win7 gpu and pdf are never finishing and keeping the test | 141   # Certain gm's on win7 gpu and pdf are never finishing and keeping the test | 
| 121   # running forever | 142   # running forever | 
| 122   if 'Win7' in bot: | 143   if 'Win7' in bot: | 
| 123     blacklist.extend('msaa16 gm _ colorwheelnative'.split(' ')) | 144     blacklist.extend('msaa16 gm _ colorwheelnative'.split(' ')) | 
| 124     blacklist.extend('pdf gm _ fontmgr_iter_factory'.split(' ')) | 145     blacklist.extend('pdf gm _ fontmgr_iter_factory'.split(' ')) | 
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 222   if len(sys.argv) == 2 and sys.argv[1] == 'test': | 243   if len(sys.argv) == 2 and sys.argv[1] == 'test': | 
| 223     self_test() | 244     self_test() | 
| 224     sys.exit(0) | 245     sys.exit(0) | 
| 225 | 246 | 
| 226   if len(sys.argv) != 3: | 247   if len(sys.argv) != 3: | 
| 227     print usage | 248     print usage | 
| 228     sys.exit(1) | 249     sys.exit(1) | 
| 229 | 250 | 
| 230   with open(sys.argv[1], 'w') as out: | 251   with open(sys.argv[1], 'w') as out: | 
| 231     json.dump(get_args(sys.argv[2]), out) | 252     json.dump(get_args(sys.argv[2]), out) | 
| OLD | NEW | 
|---|