Title: [268938] trunk/Tools
Revision
268938
Author
tsav...@apple.com
Date
2020-10-23 13:13:34 -0700 (Fri, 23 Oct 2020)

Log Message

Unreviewed, reverting r268761.

May have casued webrtc crashes on Catalina Debug.

Reverted changeset:

"[webkitpy] Use allowlist and blocklist"
https://bugs.webkit.org/show_bug.cgi?id=217985
https://trac.webkit.org/changeset/268761

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (268937 => 268938)


--- trunk/Tools/ChangeLog	2020-10-23 19:27:18 UTC (rev 268937)
+++ trunk/Tools/ChangeLog	2020-10-23 20:13:34 UTC (rev 268938)
@@ -1,3 +1,15 @@
+2020-10-23  Truitt Savell  <tsav...@apple.com>
+
+        Unreviewed, reverting r268761.
+
+        May have casued webrtc crashes on Catalina Debug.
+
+        Reverted changeset:
+
+        "[webkitpy] Use allowlist and blocklist"
+        https://bugs.webkit.org/show_bug.cgi?id=217985
+        https://trac.webkit.org/changeset/268761
+
 2020-10-23  Jonathan Bedard  <jbed...@apple.com>
 
         [webkitpy] Remove the old autointaller

Modified: trunk/Tools/Scripts/webkitpy/pylintrc (268937 => 268938)


--- trunk/Tools/Scripts/webkitpy/pylintrc	2020-10-23 19:27:18 UTC (rev 268937)
+++ trunk/Tools/Scripts/webkitpy/pylintrc	2020-10-23 20:13:34 UTC (rev 268938)
@@ -38,7 +38,7 @@
 # Profiled execution.
 profile=""
 
-# Add files or directories to the blocklist. They should be base names, not
+# Add files or directories to the blacklist. They should be base names, not
 # paths.
 ignore=CVS
 

Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (268937 => 268938)


--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py	2020-10-23 19:27:18 UTC (rev 268937)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py	2020-10-23 20:13:34 UTC (rev 268938)
@@ -2484,7 +2484,7 @@
             break
 
 
-# Enum declaration allowlist
+# Enum declaration whitelist
 _ALLOW_ALL_UPPERCASE_ENUM = ['JSTokenType']
 
 

Modified: trunk/Tools/Scripts/webkitpy/w3c/common.py (268937 => 268938)


--- trunk/Tools/Scripts/webkitpy/w3c/common.py	2020-10-23 19:27:18 UTC (rev 268937)
+++ trunk/Tools/Scripts/webkitpy/w3c/common.py	2020-10-23 20:13:34 UTC (rev 268938)
@@ -79,12 +79,12 @@
     skipped basenames are never imported or exported.
     """
     assert '/' not in basename
-    blocklist = [
+    blacklist = [
         'MANIFEST.json',    # MANIFEST.json is automatically regenerated.
         'OWNERS',           # https://crbug.com/584660 https://crbug.com/702283
         'reftest.list',     # https://crbug.com/582838
     ]
-    return (basename in blocklist
+    return (basename in blacklist
             or is_testharness_baseline(basename)
             or basename.startswith('.'))
 

Modified: trunk/Tools/flatpak/flatpakutils.py (268937 => 268938)


--- trunk/Tools/flatpak/flatpakutils.py	2020-10-23 19:27:18 UTC (rev 268937)
+++ trunk/Tools/flatpak/flatpakutils.py	2020-10-23 20:13:34 UTC (rev 268938)
@@ -615,13 +615,13 @@
 
         command = [os.path.join(gst_dir, 'gst-env.py'), '--builddir', gst_builddir, '--srcdir', gst_dir, "--only-environment"]
         gst_env = run_sanitized(command, gather_output=True)
-        allowlist = ("LD_LIBRARY_PATH", "PATH", "PKG_CONFIG_PATH")
+        whitelist = ("LD_LIBRARY_PATH", "PATH", "PKG_CONFIG_PATH")
         nopathlist = ("GST_DEBUG", "GST_VERSION", "GST_ENV")
         env = []
         for line in [line for line in gst_env.splitlines() if not line.startswith("export")]:
             tokens = line.split("=")
             var_name, contents = tokens[0], "=".join(tokens[1:])
-            if not var_name.startswith("GST_") and var_name not in allowlist:
+            if not var_name.startswith("GST_") and var_name not in whitelist:
                 continue
             if var_name not in nopathlist:
                 new_contents = ':'.join([self.host_path_to_sandbox_path(p) for p in contents.split(":")])
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to