From d26b3e2d511fb14f16d8bc2e3a26c29626e78288 Mon Sep 17 00:00:00 2001
From: Mike Klein <mtklein@google.com>
Date: Fri, 24 Jul 2020 12:16:50 -0500
Subject: [PATCH] rename tools/xsan.blacklist

No real way around using -fsanitize-blacklist,
but we can change the rest.

Bug: 1101491
Change-Id: I3ec84bd2911b6cf6e77eac1c9d565a398bfcde77
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305754
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
---
 gn/BUILD.gn                         | 8 ++++----
 tools/{xsan.blacklist => xsan.supp} | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename tools/{xsan.blacklist => xsan.supp} (79%)

diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 9d10c27968..e4c7e4a034 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -260,17 +260,17 @@ config("default") {
       sanitizers = "memory"
     }
 
-    _blacklist = rebase_path("../tools/xsan.blacklist")
+    _suppressions = rebase_path("../tools/xsan.supp")
 
     cflags += [
       "-fsanitize=$sanitizers",
       "-fno-sanitize-recover=$sanitizers",
-      "-fsanitize-blacklist=$_blacklist",
+      "-fsanitize-blacklist=$_suppressions",
     ]
 
     if (is_win) {
       cflags += [
-        "/FI$_blacklist",
+        "/FI$_suppressions",
 
         # On Release builds, we get strange warnings about string literals.
         "/GF-",
@@ -280,7 +280,7 @@ config("default") {
       libs += [ "$clang_win/lib/clang/$clang_win_version/lib/windows/clang_rt.asan-x86_64.lib" ]
     } else {
       cflags += [
-        "-include$_blacklist",
+        "-include$_suppressions",
         "-fno-omit-frame-pointer",
       ]
 
diff --git a/tools/xsan.blacklist b/tools/xsan.supp
similarity index 79%
rename from tools/xsan.blacklist
rename to tools/xsan.supp
index df2b3849d9..3530e2a843 100644
--- a/tools/xsan.blacklist
+++ b/tools/xsan.supp
@@ -1,7 +1,7 @@
 #if 0
 
-#  This file must be a no-op C #include header, and a valid *SAN blacklist file.
-#  Luckily, anything starting with # is a comment to *SAN blacklist files,
+#  This file must be a no-op C #include header, and a valid *SAN compile-time suppression file.
+#  Luckily, anything starting with # is a comment to *SAN compile-time suppression files,
 #  and anything inside #if 0 is ignored by C.  Yippee!
 #
 #  If you want to type '*', type '.*' instead.  Don't make C comments!