From 1334b41f0f1cce30b86fe95a13d9c84aa3eb0914 Mon Sep 17 00:00:00 2001
From: mtklein <mtklein@chromium.org>
Date: Sun, 7 Feb 2016 11:17:23 -0800
Subject: [PATCH] msan: these might be okay with libjpeg guarded.

BUG=skia:4550
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1677913002

CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot

Review URL: https://codereview.chromium.org/1677913002
---
 tools/dm_flags.json | 81 ---------------------------------------------
 tools/dm_flags.py   |  7 ----
 2 files changed, 88 deletions(-)

diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index 834c177a52..e8c9f94816 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -1967,86 +1967,6 @@
     "_", 
     "image", 
     "_", 
-    ".arw", 
-    "_", 
-    "image", 
-    "_", 
-    ".cr2", 
-    "_", 
-    "image", 
-    "_", 
-    ".dng", 
-    "_", 
-    "image", 
-    "_", 
-    ".nef", 
-    "_", 
-    "image", 
-    "_", 
-    ".nrw", 
-    "_", 
-    "image", 
-    "_", 
-    ".orf", 
-    "_", 
-    "image", 
-    "_", 
-    ".raf", 
-    "_", 
-    "image", 
-    "_", 
-    ".rw2", 
-    "_", 
-    "image", 
-    "_", 
-    ".pef", 
-    "_", 
-    "image", 
-    "_", 
-    ".srw", 
-    "_", 
-    "image", 
-    "_", 
-    ".ARW", 
-    "_", 
-    "image", 
-    "_", 
-    ".CR2", 
-    "_", 
-    "image", 
-    "_", 
-    ".DNG", 
-    "_", 
-    "image", 
-    "_", 
-    ".NEF", 
-    "_", 
-    "image", 
-    "_", 
-    ".NRW", 
-    "_", 
-    "image", 
-    "_", 
-    ".ORF", 
-    "_", 
-    "image", 
-    "_", 
-    ".RAF", 
-    "_", 
-    "image", 
-    "_", 
-    ".RW2", 
-    "_", 
-    "image", 
-    "_", 
-    ".PEF", 
-    "_", 
-    "image", 
-    "_", 
-    ".SRW", 
-    "_", 
-    "image", 
-    "_", 
     ".wbmp", 
     "_", 
     "image", 
@@ -2057,7 +1977,6 @@
     "_", 
     ".bmp", 
     "--match", 
-    "~Codec", 
     "~BlurLargeImage", 
     "~FontMgrAndroidParser"
   ], 
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index ab8a37e5fe..9c29ffb6f7 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -191,17 +191,10 @@ def get_args(bot):
 
   # Hacking around trying to get the MSAN bot green.
   if 'MSAN' in bot:
-    # S32A_Opaque_BlitRow32_SSE4's sk_msan_assert_initialized failing on .SRW.
-    r = ["arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw",
-         "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW"]
-    for raw_ext in r:
-      blacklist.extend(('_ image _ .%s' % raw_ext).split(' '))
-
     blacklist.extend(('_ image _ .wbmp').split(' '))  # skia:4900
     blacklist.extend(('_ image _ .png').split(' '))  # I8 .png color tables
     blacklist.extend(('_ image _ .bmp').split(' '))  # I8 .bmp color tables
 
-    match.append('~Codec')                 # Uninitialzied memory used in PIEX.
     match.append('~BlurLargeImage')        # Bug in the GM?
     match.append('~FontMgrAndroidParser')  # expat currently uninstrumented.