summaryrefslogtreecommitdiff
path: root/site_scons
diff options
context:
space:
mode:
authorShreyas Kalyan <shreyas.kalyan@10gen.com>2021-05-05 20:12:00 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-05-14 19:07:16 +0000
commit47d99621851c0cd8da8d0628edeaa2f59bff6e14 (patch)
treec827d9bcbed0739bc2a421060182d00251825573 /site_scons
parent97ff562f3379ce7e9a7da0c9eb249d35c34c03b1 (diff)
downloadmongo-47d99621851c0cd8da8d0628edeaa2f59bff6e14.tar.gz
SERVER-55964 Replace "blacklist" in all code and comments
Diffstat (limited to 'site_scons')
-rw-r--r--site_scons/site_tools/ccache.py4
-rw-r--r--site_scons/site_tools/mongo_test_execution.py6
-rw-r--r--site_scons/site_tools/next/ccache.py4
-rw-r--r--site_scons/site_tools/next/mongo_test_execution.py6
4 files changed, 10 insertions, 10 deletions
diff --git a/site_scons/site_tools/ccache.py b/site_scons/site_tools/ccache.py
index 2a894919f8d..de7d03e5472 100644
--- a/site_scons/site_tools/ccache.py
+++ b/site_scons/site_tools/ccache.py
@@ -144,8 +144,8 @@ def generate(env):
# hash result to prevent erroneous cache hits.
if "CCACHE_EXTRAFILES" in env and env["CCACHE_EXTRAFILES"]:
env["ENV"]["CCACHE_EXTRAFILES"] = ":".join([
- blackfile.path
- for blackfile in env["CCACHE_EXTRAFILES"]
+ denyfile.path
+ for denyfile in env["CCACHE_EXTRAFILES"]
])
# Make a generator to expand to CCACHE in the case where we are
diff --git a/site_scons/site_tools/mongo_test_execution.py b/site_scons/site_tools/mongo_test_execution.py
index 1a7cab79e59..c60d5c6e164 100644
--- a/site_scons/site_tools/mongo_test_execution.py
+++ b/site_scons/site_tools/mongo_test_execution.py
@@ -43,7 +43,7 @@ def generate_test_execution_aliases(env, test):
# Strip suffix
dot_idx = source_base_name.rfind(".")
suffix = source_base_name[dot_idx:]
- if suffix in env["TEST_EXECUTION_SUFFIX_BLACKLIST"]:
+ if suffix in env["TEST_EXECUTION_SUFFIX_DENYLIST"]:
continue
source_name = source_base_name[:dot_idx]
@@ -70,8 +70,8 @@ def generate(env):
env.Alias("test-execution-aliases")
env.AddMethod(generate_test_execution_aliases, "GenerateTestExecutionAliases")
- env["TEST_EXECUTION_SUFFIX_BLACKLIST"] = env.get(
- "TEST_EXECUTION_SUFFIX_BLACKLIST", [".in"]
+ env["TEST_EXECUTION_SUFFIX_DENYLIST"] = env.get(
+ "TEST_EXECUTION_SUFFIX_DENYLIST", [".in"]
)
# TODO: Remove when the new ninja generator is the only supported generator
diff --git a/site_scons/site_tools/next/ccache.py b/site_scons/site_tools/next/ccache.py
index 2a894919f8d..de7d03e5472 100644
--- a/site_scons/site_tools/next/ccache.py
+++ b/site_scons/site_tools/next/ccache.py
@@ -144,8 +144,8 @@ def generate(env):
# hash result to prevent erroneous cache hits.
if "CCACHE_EXTRAFILES" in env and env["CCACHE_EXTRAFILES"]:
env["ENV"]["CCACHE_EXTRAFILES"] = ":".join([
- blackfile.path
- for blackfile in env["CCACHE_EXTRAFILES"]
+ denyfile.path
+ for denyfile in env["CCACHE_EXTRAFILES"]
])
# Make a generator to expand to CCACHE in the case where we are
diff --git a/site_scons/site_tools/next/mongo_test_execution.py b/site_scons/site_tools/next/mongo_test_execution.py
index b7b783c006e..2433e446c8c 100644
--- a/site_scons/site_tools/next/mongo_test_execution.py
+++ b/site_scons/site_tools/next/mongo_test_execution.py
@@ -72,7 +72,7 @@ def generate_test_execution_aliases(env, test):
# Strip suffix
dot_idx = source_base_name.rfind(".")
suffix = source_base_name[dot_idx:]
- if suffix in env["TEST_EXECUTION_SUFFIX_BLACKLIST"]:
+ if suffix in env["TEST_EXECUTION_SUFFIX_DENYLIST"]:
continue
source_name = source_base_name[:dot_idx]
@@ -137,8 +137,8 @@ def generate(env):
env.Alias("test-execution-aliases")
env.AddMethod(generate_test_execution_aliases, "GenerateTestExecutionAliases")
- env["TEST_EXECUTION_SUFFIX_BLACKLIST"] = env.get(
- "TEST_EXECUTION_SUFFIX_BLACKLIST", [".in"]
+ env["TEST_EXECUTION_SUFFIX_DENYLIST"] = env.get(
+ "TEST_EXECUTION_SUFFIX_DENYLIST", [".in"]
)
env.AppendUnique(